Commit Graph

23359 Commits

Author SHA1 Message Date
Michael Wright aa7b0312e0 Merge "Fix strstr16." into nyc-dev am: a34a383607
am: a12fb416d7

* commit 'a12fb416d7b2105f3a7fd9ae78cf98eaf183092d':
  Fix strstr16.

Change-Id: I6776ce521daf4b45f22c55dbee714f2abe8c599e
2016-05-17 17:33:29 +00:00
Michael Wright a12fb416d7 Merge "Fix strstr16." into nyc-dev
am: a34a383607

* commit 'a34a383607007d632878929c6c9278221242d457':
  Fix strstr16.

Change-Id: Ia41d8da5d627ac1e28f2fe7b02c7e9a740727556
2016-05-17 17:27:56 +00:00
Michael Wright a34a383607 Merge "Fix strstr16." into nyc-dev 2016-05-17 17:18:49 +00:00
Elliott Hughes 8d6aad114b Merge "Don\'t include <machine/cpu-features.h>." am: 9b0eb7cdf4 am: e2c741ce0f
am: 8161406c59

* commit '8161406c5964fd020250b6d4c961d7bdd79944da':
  Don't include <machine/cpu-features.h>.

Change-Id: I56a268c3219153e967ad405470756122985849d2
2016-05-17 04:10:59 +00:00
Dimitry Ivanov cc55c7e7ea Merge "Pass permitted_path to the linker as is." am: a214a769f9 am: f7d2b8276a
am: d05e902aaf

* commit 'd05e902aaf25bbd652f2fef760d3150dde2e062d':

Change-Id: Icdcf538d6f87db83f4820bcfe8d220aaeb72a551
2016-05-17 04:10:59 +00:00
Elliott Hughes 8161406c59 Merge "Don\'t include <machine/cpu-features.h>." am: 9b0eb7cdf4
am: e2c741ce0f

* commit 'e2c741ce0fa6e956bf0c70e5b132d4f62fb44738':
  Don't include <machine/cpu-features.h>.

Change-Id: Ib31e7262da17dfad7a50172d1ebd2735d6090338
2016-05-17 04:08:46 +00:00
Dimitry Ivanov d05e902aaf Merge "Pass permitted_path to the linker as is." am: a214a769f9
am: f7d2b8276a

* commit 'f7d2b8276ad3020c9f5c8accf26ba78e2e1a05c1':
  Pass permitted_path to the linker as is.

Change-Id: I9c8db389290e71893cfb23efee296e68e084f388
2016-05-17 04:08:46 +00:00
Dimitry Ivanov 65b5d53cca Pass permitted_path to the linker as is. am: 25df4bff44
am: 4f31668ad8

* commit '4f31668ad8ceff9280d82dd190bf3bca8d9d2e86':

Change-Id: I9e7f4854b7bd3691b7b0d3bef6d11c2bdb299f46
2016-05-17 04:08:36 +00:00
Dimitry Ivanov 86fa75a133 Pass permitted_path to the linker as is. am: 25df4bff44
am: d98683f415

* commit 'd98683f415db73668378e1945d4eb5c9dc2d0a18':
  Pass permitted_path to the linker as is.

Change-Id: Ia31cac8b21ecb9de1cdaca64a935a16f2e6459ee
2016-05-17 04:08:17 +00:00
Dimitry Ivanov d98683f415 Pass permitted_path to the linker as is.
am: 25df4bff44

* commit '25df4bff44a0d1a342dc45521bf7e860b3fef947':
  Pass permitted_path to the linker as is.

Change-Id: Idf8459267f8e1cc7bebc9a55b1272871b3d8119a
2016-05-17 04:06:05 +00:00
Dimitry Ivanov 4f31668ad8 Pass permitted_path to the linker as is.
am: 25df4bff44

* commit '25df4bff44a0d1a342dc45521bf7e860b3fef947':
  Pass permitted_path to the linker as is.

Change-Id: I46db0abda9d9e1855af499fce47b899f278d0658
2016-05-17 04:05:43 +00:00
Elliott Hughes e2c741ce0f Merge "Don\'t include <machine/cpu-features.h>."
am: 9b0eb7cdf4

* commit '9b0eb7cdf4ac4650fc3f476c2f5a91c50a18e524':
  Don't include <machine/cpu-features.h>.

Change-Id: Ie2b744b8dc414b7dc8568dae77eeb3babf7df3a8
2016-05-17 03:13:07 +00:00
Elliott Hughes 9b0eb7cdf4 Merge "Don't include <machine/cpu-features.h>." 2016-05-17 03:10:05 +00:00
Dimitry Ivanov 83529dcf2e resolve merge conflicts of f7d2b82 to nyc-dev-plus-aosp
Change-Id: I8d2ef1e4c93bab18d6b08af6ba14ef0531fcfa6a
2016-05-16 18:23:43 -07:00
Dimitry Ivanov f7d2b8276a Merge "Pass permitted_path to the linker as is."
am: a214a769f9

* commit 'a214a769f9a98b0962e62bd716575a05cf6f9f59':
  Pass permitted_path to the linker as is.

Change-Id: Ic4d8e6a67ca069319d872e6f3dcb76e857162093
2016-05-17 01:13:29 +00:00
Dimitry Ivanov 25df4bff44 Pass permitted_path to the linker as is.
Now that we have the fixed list of whitelisted libraries
there is no longer need to check if java_permitted_path is nullptr.
In fact checking it prevents custom classloaders created by apps
from loading libraries using absolute path.

Bug: http://b/28659864
Change-Id: I1bfc16a573b090f70f078ecccd0e4016939a5dc0
(cherry picked from commit b31caa95ec)
2016-05-16 18:09:15 -07:00
Treehugger Robot a214a769f9 Merge "Pass permitted_path to the linker as is." 2016-05-17 01:05:01 +00:00
Elliott Hughes a1b9bd901f Don't include <machine/cpu-features.h>.
We're not using it.

Change-Id: Ic128cf9297e1627c839c48f1954c19d7070654d7
2016-05-16 17:55:27 -07:00
Dimitry Ivanov b31caa95ec Pass permitted_path to the linker as is.
Now that we have the fixed list of whitelisted libraries
there is no longer need to check if java_permitted_path is nullptr.
In fact checking it prevents custom classloaders created by apps
from loading libraries using absolute path.

Bug: http://b/28659864
Change-Id: I1bfc16a573b090f70f078ecccd0e4016939a5dc0
2016-05-16 17:08:06 -07:00
Josh Gao afd64bad68 Merge "adb/base: allow use of unique_fd inside adb." am: 210fdc2742 am: 881b440b7a
am: 8781256b19

* commit '8781256b19619a142b671db94eef12cbcbe59bd9':
  adb/base: allow use of unique_fd inside adb.

Change-Id: Id621485213934e5a8d1acfcde41fa5291b25e7f4
2016-05-16 22:05:16 +00:00
Josh Gao 8781256b19 Merge "adb/base: allow use of unique_fd inside adb." am: 210fdc2742
am: 881b440b7a

* commit '881b440b7a228e065d4b42ec71add07fbcb336c4':
  adb/base: allow use of unique_fd inside adb.

Change-Id: Ib1c437bcc6462235b8a753fb8cdedb9ff7261e9c
2016-05-16 22:02:55 +00:00
Josh Gao 881b440b7a Merge "adb/base: allow use of unique_fd inside adb."
am: 210fdc2742

* commit '210fdc2742d3cadaa2f8255ad22b4a2b7bdbf743':
  adb/base: allow use of unique_fd inside adb.

Change-Id: Ic7d36d38343f46a541452ca6f6b622f3c5c74c26
2016-05-16 21:56:56 +00:00
Treehugger Robot 210fdc2742 Merge "adb/base: allow use of unique_fd inside adb." 2016-05-16 21:42:02 +00:00
Michael Wright 0fd60eb9b4 Fix strstr16.
strcmp needs a limit, otherwise it will compare the null terminator
with the next character in the haystack, which results in the compare
failing for all searches except where the needle is found at the very
end.

Bug: 28663748
Change-Id: I1939dc4037c2f2a75d617943b063d2d38a8c5e3a
2016-05-16 21:23:07 +01:00
Winter Wang 66d69b902f Merge "init: usb: disable usb function switch until adbd is ready" am: 2a26c2a836 am: b61ecb5213
am: 7e11db1b32

* commit '7e11db1b3206cd92d52fca0b324f6a5260a68aec':
  init: usb: disable usb function switch until adbd is ready

Change-Id: I12e8fab36f39a9b97e52ace30ab54b3a9fd7bf0f
2016-05-16 19:48:39 +00:00
Badhri Jagan Sridharan 7e11db1b32 Merge "init: usb: disable usb function switch until adbd is ready" am: 2a26c2a836
am: b61ecb5213

* commit 'b61ecb5213e1c94e823f23d7f5a8a0a93db617d6':
  init: usb: disable usb function switch until adbd is ready

Change-Id: I5fc733ee946b4d0accf58f56c80270f9e13d9f63
2016-05-16 19:43:50 +00:00
Winter Wang b61ecb5213 Merge "init: usb: disable usb function switch until adbd is ready"
am: 2a26c2a836

* commit '2a26c2a836af9109ce4aa6cf8128a385d14878d3':
  init: usb: disable usb function switch until adbd is ready

Change-Id: I406d35a4c6a18e2d84d49450a72a1bc3be7233ee
2016-05-16 19:41:31 +00:00
Badhri Jagan Sridharan 2a26c2a836 Merge "init: usb: disable usb function switch until adbd is ready" 2016-05-16 19:34:51 +00:00
Greg Hackmann 0a5f91b894 Merge "SystemClock: elapsedRealtimeNano() should use clock_gettime() on Linux" am: e3ff256228 am: 6d28bd81f5
am: 1e18e78601

* commit '1e18e78601b8ffd3e51f172ec3ed44640a4f4ff5':
  SystemClock: elapsedRealtimeNano() should use clock_gettime() on Linux

Change-Id: If8d414f9dbfbd799fa5b1baf673cdbfd422896a3
2016-05-16 18:26:02 +00:00
Greg Hackmann a71714964c Merge "SystemClock: add test" am: 282e8fb037 am: a91a1a990f
am: 8f9a6372f6

* commit '8f9a6372f69f1528643cc24eab6048ab858b4997':
  SystemClock: add test

Change-Id: I4738ab2c9105099c92f5e583c9b5a2815dcc107e
2016-05-16 18:26:01 +00:00
Greg Hackmann 1e18e78601 Merge "SystemClock: elapsedRealtimeNano() should use clock_gettime() on Linux" am: e3ff256228
am: 6d28bd81f5

* commit '6d28bd81f55236d1a82f00f8ac568ad61a03128d':
  SystemClock: elapsedRealtimeNano() should use clock_gettime() on Linux

Change-Id: Id5ecad63fb6cd79cc7db641d992e9525bc2b8779
2016-05-16 18:23:42 +00:00
Greg Hackmann 8f9a6372f6 Merge "SystemClock: add test" am: 282e8fb037
am: a91a1a990f

* commit 'a91a1a990f1d629377dcd2c3f2b57ccab48dc8cf':
  SystemClock: add test

Change-Id: I547a4c3422eb468530e3cdd02eb2bb157a444a15
2016-05-16 18:23:41 +00:00
Greg Hackmann 6d28bd81f5 Merge "SystemClock: elapsedRealtimeNano() should use clock_gettime() on Linux"
am: e3ff256228

* commit 'e3ff25622840e8b79e30f7f8bda4715a103afb67':
  SystemClock: elapsedRealtimeNano() should use clock_gettime() on Linux

Change-Id: Id5a10854412308fb096a037977eea5e80931e1f8
2016-05-16 18:21:23 +00:00
Greg Hackmann a91a1a990f Merge "SystemClock: add test"
am: 282e8fb037

* commit '282e8fb037031fa8de02dd3ea5a6944c5d24f4d8':
  SystemClock: add test

Change-Id: Id45600a898ae89ae7a1be262f5655f30eed22205
2016-05-16 18:21:22 +00:00
Treehugger Robot e3ff256228 Merge "SystemClock: elapsedRealtimeNano() should use clock_gettime() on Linux" 2016-05-16 18:18:57 +00:00
Treehugger Robot 282e8fb037 Merge "SystemClock: add test" 2016-05-16 18:18:30 +00:00
Jeremy Compostella 981925e6d2 Merge "fs_mgr: update block device reference in verity metadata" am: 4cefb91611 am: 30c9aed0be
am: 348f3590f0

* commit '348f3590f0c758916f7c27d47b00d40e609baf63':
  fs_mgr: update block device reference in verity metadata

Change-Id: Ie8dcf633b193afd63803d8a0390cf203bda8857d
2016-05-16 18:16:38 +00:00
Badhri Jagan Sridharan 348f3590f0 Merge "fs_mgr: update block device reference in verity metadata" am: 4cefb91611
am: 30c9aed0be

* commit '30c9aed0becc77a31a2b86b8683db5630fc95024':
  fs_mgr: update block device reference in verity metadata

Change-Id: I2d024cefaa15b62cb6b0ffa6fe57c904304c5160
2016-05-16 18:13:45 +00:00
Jeremy Compostella 30c9aed0be Merge "fs_mgr: update block device reference in verity metadata"
am: 4cefb91611

* commit '4cefb91611912dd7a3f8059ee2b993cec2d0b9bb':
  fs_mgr: update block device reference in verity metadata

Change-Id: Ia734c90ea25168060fc20b13f8b88de11d5e7568
2016-05-16 18:11:23 +00:00
Badhri Jagan Sridharan 4cefb91611 Merge "fs_mgr: update block device reference in verity metadata" 2016-05-16 18:06:38 +00:00
Elliott Hughes 07d0a44e08 Merge "Don\'t expose ashmem constants on the host." am: 54fed512b9 am: ed95190b69
am: cb4abee6ca

* commit 'cb4abee6caecdc42c6bcc2f48e824c4708df0874':
  Don't expose ashmem constants on the host.

Change-Id: I12befdeaa87adb1dbadc63689836a21aa4f9019f
2016-05-16 17:37:56 +00:00
Elliott Hughes cb4abee6ca Merge "Don\'t expose ashmem constants on the host." am: 54fed512b9
am: ed95190b69

* commit 'ed95190b690adf3a452001fc527881af913c5ccd':
  Don't expose ashmem constants on the host.

Change-Id: I930dd0b72e88647b1e94694e5fb183431c7d75c6
2016-05-16 17:34:13 +00:00
Elliott Hughes ed95190b69 Merge "Don\'t expose ashmem constants on the host."
am: 54fed512b9

* commit '54fed512b9846a024332deb8bdffe0ee5ce784e0':
  Don't expose ashmem constants on the host.

Change-Id: I5550cd35693a6c7d6e68880018b2acbc9caa90a6
2016-05-16 17:31:06 +00:00
Elliott Hughes 54fed512b9 Merge "Don't expose ashmem constants on the host." 2016-05-16 17:23:52 +00:00
Jeremy Compostella dfd2478bd1 fs_mgr: update block device reference in verity metadata
The dm-verity metadata contains the block device path that is given to
the dm-android-verity driver.  If the device is using slot A/B, this
path is missing the slot suffix.

This patch makes fs_mgr replace all the block device path reference
with the one including the active slot suffix.

Change-Id: Ib624d0d18b12a8a287cac7f15605a2e0fb7c97c6
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
2016-05-16 16:37:24 +00:00
Android Build Merger (Role) db724a850a Merge "Merge "Add String16#contains and strstr16 methods." into nyc-dev am: 8b452b876b am: 3fe4a71e5f" into nyc-mr1-dev-plus-aosp 2016-05-16 14:21:41 +00:00
Michael Wright a0f75f0512 Merge "Add String16#contains and strstr16 methods." into nyc-dev am: 8b452b876b
am: 3fe4a71e5f

* commit '3fe4a71e5fb3d4727bc22e5ab6cfc96ffdb6bb87':

Change-Id: I65a71f372aa0656b6665d84d340851f0d02a12ae
2016-05-16 14:21:32 +00:00
Michael Wright 0af057d502 Merge "Merge commit '3fe4a71e5fb3d4727bc22e5ab6cfc96ffdb6bb87' into manual_merge_3fe4a71" into nyc-mr1-dev-plus-aosp 2016-05-16 14:20:45 +00:00
Michael Wright e26e1819cb Merge commit \'8b452b876b90dcfff1dab9012b65b5e67c4531a4\' into manual_merge_8b452b8
am: 2a9a993af9

* commit '2a9a993af99585af0bce6eca6d92c86370977a27':
  Add String16#contains and strstr16 methods.

Change-Id: Icaa1c7f8d458d6f2651c72b376116e6952be9910
2016-05-16 14:18:34 +00:00
Michael Wright 63d67dd5f0 Merge commit '3fe4a71e5fb3d4727bc22e5ab6cfc96ffdb6bb87' into manual_merge_3fe4a71
Change-Id: I3cf8d1a1d4617431484da3317ab56311a108dc9b
2016-05-16 15:16:27 +01:00