OSDN Git Service
Felipe Leme [Thu, 10 Aug 2017 18:57:53 +0000 (18:57 +0000)]
Merge "CharSequenceTransformation should not change anything when comparision fails." into oc-mr1-dev
am:
0edb324403
Change-Id: I2840d5d2fb5f71ad2f6dda8788e62c5343d0a65f
TreeHugger Robot [Thu, 10 Aug 2017 18:48:55 +0000 (18:48 +0000)]
Merge "CharSequenceTransformation should not change anything when comparision fails." into oc-mr1-dev
Hall Liu [Thu, 10 Aug 2017 18:29:19 +0000 (18:29 +0000)]
Merge "Hide the SEND_EMBMS_INTENTS permission" into oc-mr1-dev
am:
d259d8b80f
Change-Id: I5abcbb619d38beb28be00f34a1ee3cffe351c721
Hall Liu [Thu, 10 Aug 2017 18:20:47 +0000 (18:20 +0000)]
Merge "Hide the SEND_EMBMS_INTENTS permission" into oc-mr1-dev
Ian Pedowitz [Thu, 10 Aug 2017 18:07:59 +0000 (18:07 +0000)]
Merge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev am:
0716c8e60e
am:
28440ed3b9 -s ours
Change-Id: I6d49a535724b9bc37405c37ae6246fa67004a6a3
Android Build Merger (Role) [Thu, 10 Aug 2017 18:05:57 +0000 (18:05 +0000)]
Merge "Merge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev am:
0716c8e60e -s ours am:
c71be69f49 -s ours" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 10 Aug 2017 18:00:58 +0000 (18:00 +0000)]
Merge "Merge "The method of parseEfSpdi does not match TS24008." am:
cd03d0db9d am:
cfbd4a354a am:
1cdd44bd9d am:
793c4be8d4" into oc-mr1-dev-plus-aosp
Ian Pedowitz [Thu, 10 Aug 2017 17:58:24 +0000 (17:58 +0000)]
Merge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev am:
0716c8e60e -s ours
am:
c71be69f49 -s ours
Change-Id: I6f4601f905da7668bb204414e20815255e3fd481
Amit Mahajan [Thu, 10 Aug 2017 17:54:12 +0000 (17:54 +0000)]
Merge "The method of parseEfSpdi does not match TS24008." am:
cd03d0db9d am:
cfbd4a354a am:
1cdd44bd9d
am:
793c4be8d4
Change-Id: I4c7b7180fe9b56b5d7483f435a6d70530d89295f
Android Build Merger (Role) [Thu, 10 Aug 2017 17:53:26 +0000 (17:53 +0000)]
Merge "Merge "Get isim card data use subId." am:
854edcff16 am:
3466cda3d7 am:
1a808fc019 am:
e1e32370e2" into oc-mr1-dev-plus-aosp
Ian Pedowitz [Thu, 10 Aug 2017 17:46:32 +0000 (17:46 +0000)]
Merge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev
am:
0716c8e60e
Change-Id: I1016361cd17be52a02a21fb4d1da791c0247be1d
Beverly [Thu, 10 Aug 2017 17:46:21 +0000 (17:46 +0000)]
Merge "Low battery notification has unique sound." into oc-mr1-dev
am:
9ac6be4a66
Change-Id: I3a2775b2e7292c56a3a5294df5da13974d99e168
Amit Mahajan [Thu, 10 Aug 2017 17:46:01 +0000 (17:46 +0000)]
Merge "Get isim card data use subId." am:
854edcff16 am:
3466cda3d7 am:
1a808fc019
am:
e1e32370e2
Change-Id: Ice6d00e2cdfc7b3afff23b3a64d50afc85a56830
Ian Pedowitz [Thu, 10 Aug 2017 17:45:50 +0000 (17:45 +0000)]
Merge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev
am:
0716c8e60e -s ours
Change-Id: Iebfcbec5681f6b600c662ba1f3e705f10be79437
TreeHugger Robot [Thu, 10 Aug 2017 17:37:05 +0000 (17:37 +0000)]
Merge "Low battery notification has unique sound." into oc-mr1-dev
Amit Mahajan [Thu, 10 Aug 2017 17:34:07 +0000 (17:34 +0000)]
Merge "The method of parseEfSpdi does not match TS24008." am:
cd03d0db9d am:
cfbd4a354a
am:
1cdd44bd9d
Change-Id: I8ed8d16910331f09a0e44e908e7ac89e990af141
TreeHugger Robot [Thu, 10 Aug 2017 17:32:47 +0000 (17:32 +0000)]
Merge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev
Amit Mahajan [Thu, 10 Aug 2017 17:27:24 +0000 (17:27 +0000)]
Merge "Get isim card data use subId." am:
854edcff16 am:
3466cda3d7
am:
1a808fc019
Change-Id: I27f67b172bd8096ee00b9c80bb9699b33eff97f7
Beverly [Thu, 10 Aug 2017 16:49:36 +0000 (16:49 +0000)]
Merge "Localization of zen mode default rules." into oc-mr1-dev
am:
15ea142044
Change-Id: I28ad1c56e5bd1b9c7eec2cee336e22e5d7c0b6af
TreeHugger Robot [Thu, 10 Aug 2017 16:41:36 +0000 (16:41 +0000)]
Merge "Localization of zen mode default rules." into oc-mr1-dev
Amit Mahajan [Thu, 10 Aug 2017 16:24:56 +0000 (16:24 +0000)]
Merge "The method of parseEfSpdi does not match TS24008." am:
cd03d0db9d
am:
cfbd4a354a
Change-Id: Ic5e764bd0d5ca14498c4b36dd1f2bd9d8ba05544
Amit Mahajan [Thu, 10 Aug 2017 16:20:16 +0000 (16:20 +0000)]
Merge "Get isim card data use subId." am:
854edcff16
am:
3466cda3d7
Change-Id: I84d8b0fd15e50706e59577941428e5f5e81fa373
Amit Mahajan [Thu, 10 Aug 2017 16:12:19 +0000 (16:12 +0000)]
Merge "The method of parseEfSpdi does not match TS24008."
am:
cd03d0db9d
Change-Id: I386f5e4de89c4ac758e1702b2efdc16a43c12c33
Amit Mahajan [Thu, 10 Aug 2017 16:06:36 +0000 (16:06 +0000)]
Merge "Get isim card data use subId."
am:
854edcff16
Change-Id: I0a562f9966838cc6746c170b3bba9a250fd2633b
Amit Mahajan [Thu, 10 Aug 2017 15:59:43 +0000 (15:59 +0000)]
Merge "The method of parseEfSpdi does not match TS24008."
Amit Mahajan [Thu, 10 Aug 2017 15:57:38 +0000 (15:57 +0000)]
Merge "Get isim card data use subId."
Ian Pedowitz [Thu, 10 Aug 2017 02:15:31 +0000 (19:15 -0700)]
Revert "Initial support for proposed android.net.lowpan"
This reverts commit
4e0c2195dd999859f4e79cec1884326fb52a5916.
Fixes:
64111427
Test: Grabbed OC CTS binaries
Test: Extracted android-cts.zip and from android-cts/tools directory launched ./cts-tradefed
Test: On the DUT (running build which has this CL cherrypicked), ran the below (will run this test on both abi's):
Test: run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial <device serial>
Test: Note, while b/
64111427 is fixed, this uncovered b/
64560640
Change-Id: I1d2132678281a917f03c69d5ead1d28313d7f46d
Merged-In: Icab67ba2c40bc02968e3f8ed2da5a4a3be6cf77f
Narayan Kamath [Thu, 10 Aug 2017 15:41:36 +0000 (15:41 +0000)]
Merge "ClassLoaderFactory: Correct broken refactoring from change
19da1cf72e8." into oc-mr1-dev
am:
57ae4db225
Change-Id: I852a6b01c196240571aed51342fc5e2310c080d6
Narayan Kamath [Thu, 10 Aug 2017 15:34:22 +0000 (15:34 +0000)]
Merge "ClassLoaderFactory: Correct broken refactoring from change
19da1cf72e8." into oc-mr1-dev
Jeff Sharkey [Thu, 10 Aug 2017 15:26:22 +0000 (15:26 +0000)]
Merge "Fix handling of @removed APIs." into oc-mr1-dev
am:
5cb2d64b9b
Change-Id: I1ac9843cc17efc4ea088e5738c38dcd2ad79e5c5
Jeff Sharkey [Thu, 10 Aug 2017 15:18:58 +0000 (15:18 +0000)]
Merge "Fix handling of @removed APIs." into oc-mr1-dev
Narayan Kamath [Thu, 10 Aug 2017 11:09:13 +0000 (12:09 +0100)]
ClassLoaderFactory: Correct broken refactoring from change
19da1cf72e8.
Bug:
64493351
Test: cts-tradefed run cts-dev -t android.appsecurity.cts.ClassloaderSplitsTest -m CtsAppSecurityHostTestCases
Change-Id: Ib4868c1e0320002f5122193621e9ab56fe34819f
Narayan Kamath [Thu, 10 Aug 2017 11:14:20 +0000 (11:14 +0000)]
Merge "PackageParser: Parse android:classLoader during the full parse." into oc-mr1-dev
am:
af706b40de
Change-Id: I8e761bf1c4afba4795aa4041aeabc66b48964030
Narayan Kamath [Thu, 10 Aug 2017 11:04:40 +0000 (11:04 +0000)]
Merge "PackageParser: Parse android:classLoader during the full parse." into oc-mr1-dev
Android Build Merger (Role) [Thu, 10 Aug 2017 07:05:51 +0000 (07:05 +0000)]
Merge "Merge "Remove config_demoModePackage resource" into oc-dr1-dev am:
934a1081fe am:
365dad5b79" into oc-mr1-dev-plus-aosp
Justin Klaassen [Thu, 10 Aug 2017 07:02:07 +0000 (07:02 +0000)]
Merge "Remove config_demoModePackage resource" into oc-dr1-dev am:
934a1081fe
am:
365dad5b79
Change-Id: I1e08211ccc567560905a72dee85b1b2f05b3440b
Justin Klaassen [Thu, 10 Aug 2017 07:02:04 +0000 (07:02 +0000)]
Merge "Remove config_demoModePackage resource" into oc-dr1-dev am:
934a1081fe
am:
3704bb0740
Change-Id: I75cf8daf594f2bff3acfb7ac7cb7992c578a62b7
Justin Klaassen [Thu, 10 Aug 2017 06:53:34 +0000 (06:53 +0000)]
Merge "Remove config_demoModePackage resource" into oc-dr1-dev
am:
934a1081fe
Change-Id: I31ce02bfd8c736d8e0d46173759558faf7a6cc2f
Justin Klaassen [Thu, 10 Aug 2017 06:53:33 +0000 (06:53 +0000)]
Merge "Remove config_demoModePackage resource" into oc-dr1-dev
am:
934a1081fe
Change-Id: I147f242ab2132a01c1e02ac00ac5123fa9a0a20a
Shubang [Thu, 10 Aug 2017 06:47:35 +0000 (06:47 +0000)]
Merge "Add permission check before setMain()" into oc-mr1-dev
am:
67744e4696
Change-Id: I26ef67a44b8c041900958bd7a33097c6052c073a
TreeHugger Robot [Thu, 10 Aug 2017 06:42:32 +0000 (06:42 +0000)]
Merge "Remove config_demoModePackage resource" into oc-dr1-dev
TreeHugger Robot [Thu, 10 Aug 2017 06:39:31 +0000 (06:39 +0000)]
Merge "Add permission check before setMain()" into oc-mr1-dev
Android Build Merger (Role) [Thu, 10 Aug 2017 06:18:20 +0000 (06:18 +0000)]
Merge "Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev am:
256fe97329 am:
1e499641ce" into oc-mr1-dev-plus-aosp
Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:15:06 +0000 (06:15 +0000)]
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev am:
256fe97329
am:
1e499641ce
Change-Id: I34189a461ceabae1a74976672ae72da72381a3c2
Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:14:12 +0000 (06:14 +0000)]
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev am:
256fe97329
am:
f5174b2af3
Change-Id: Ifbe766d6925abc86d3a36d6f04ffcbc656d7fbdd
Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:06:04 +0000 (06:06 +0000)]
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
am:
256fe97329
Change-Id: I2938b5aab766f236d351d66e8912cc05091502fc
Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:05:45 +0000 (06:05 +0000)]
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
am:
256fe97329
Change-Id: Ib6b7ea67bc93c889cba63abf24778ad2415b8c03
Jayachandran Chinnakkannu [Thu, 10 Aug 2017 06:00:34 +0000 (06:00 +0000)]
Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev
Android Build Merger (Role) [Thu, 10 Aug 2017 05:49:16 +0000 (05:49 +0000)]
Merge "Merge "Add settings and reset operations for demo users" into oc-dr1-dev am:
88710dead0 am:
2189999c61" into oc-mr1-dev-plus-aosp
Christine Franks [Thu, 10 Aug 2017 05:47:01 +0000 (05:47 +0000)]
Merge "Add settings and reset operations for demo users" into oc-dr1-dev am:
88710dead0
am:
2189999c61
Change-Id: I6736c0d8ed37fb8b4b1f49a93062aa181aba69b0
Christine Franks [Thu, 10 Aug 2017 05:44:50 +0000 (05:44 +0000)]
Merge "Add settings and reset operations for demo users" into oc-dr1-dev am:
88710dead0
am:
8121e6c162
Change-Id: I13cb5be728812f1ca96c9516f5c1ffb3276303d2
Christine Franks [Thu, 10 Aug 2017 05:38:00 +0000 (05:38 +0000)]
Merge "Add settings and reset operations for demo users" into oc-dr1-dev
am:
88710dead0
Change-Id: I7b3aae902eebd27590e4799408e941ee7761b834
Christine Franks [Thu, 10 Aug 2017 05:37:57 +0000 (05:37 +0000)]
Merge "Add settings and reset operations for demo users" into oc-dr1-dev
am:
88710dead0
Change-Id: Id1b8515e9323731f7bacd55d850460f00fc2c651
TreeHugger Robot [Thu, 10 Aug 2017 05:28:47 +0000 (05:28 +0000)]
Merge "Add settings and reset operations for demo users" into oc-dr1-dev
Dianne Hackborn [Thu, 10 Aug 2017 04:43:52 +0000 (04:43 +0000)]
Merge "Go: add features for low ram / normal ram devices." into oc-mr1-dev
am:
c75f43c1ab
Change-Id: Icf9405de74c4d137b9c8cd0981846a08862ef231
TreeHugger Robot [Thu, 10 Aug 2017 04:35:09 +0000 (04:35 +0000)]
Merge "Go: add features for low ram / normal ram devices." into oc-mr1-dev
Doris Ling [Thu, 10 Aug 2017 03:53:57 +0000 (03:53 +0000)]
Merge "Add metric constant for settings preference int value change." into oc-mr1-dev
am:
c91b3bd09c
Change-Id: Ibfbcf198fbd7e6a434d5ea34f30cd989e8a81024
TreeHugger Robot [Thu, 10 Aug 2017 03:41:06 +0000 (03:41 +0000)]
Merge "Add metric constant for settings preference int value change." into oc-mr1-dev
Kevin Chyn [Thu, 10 Aug 2017 02:55:45 +0000 (02:55 +0000)]
Merge "FingerprintService should release wakelock only if isHeld" into oc-mr1-dev
am:
c48f414a3c
Change-Id: Ic42d1b2c81a610708f1dce0b62e16e14adc956ef
Justin Klaassen [Wed, 9 Aug 2017 04:07:24 +0000 (21:07 -0700)]
Remove config_demoModePackage resource
Bug:
62712426
Test: lunch walleye-eng && make -j19
Change-Id: Ifa1080d85222a43871598eaf0fe9813625d9115d
TreeHugger Robot [Thu, 10 Aug 2017 02:47:00 +0000 (02:47 +0000)]
Merge "FingerprintService should release wakelock only if isHeld" into oc-mr1-dev
Android Build Merger (Role) [Thu, 10 Aug 2017 02:37:20 +0000 (02:37 +0000)]
Merge "Merge "Don't lock down system user in demo mode" into oc-dr1-dev am:
4f540fe8d0 am:
e47f682c85" into oc-mr1-dev-plus-aosp
Christine Franks [Thu, 10 Aug 2017 02:35:15 +0000 (02:35 +0000)]
Merge "Don't lock down system user in demo mode" into oc-dr1-dev am:
4f540fe8d0
am:
e47f682c85
Change-Id: I7840cc30da45e07e5211cee433ab7bb17ede5149
Christine Franks [Thu, 10 Aug 2017 02:32:47 +0000 (02:32 +0000)]
Merge "Don't lock down system user in demo mode" into oc-dr1-dev am:
4f540fe8d0
am:
f3b6768601
Change-Id: I77314a70753675d94c717d62abb40b7d2b42ac11
Christine Franks [Thu, 10 Aug 2017 02:25:10 +0000 (02:25 +0000)]
Merge "Don't lock down system user in demo mode" into oc-dr1-dev
am:
4f540fe8d0
Change-Id: I1d86ea5b69fe9a8bddb29d3e8483cc6a34b3b689
Christine Franks [Thu, 10 Aug 2017 02:25:09 +0000 (02:25 +0000)]
Merge "Don't lock down system user in demo mode" into oc-dr1-dev
am:
4f540fe8d0
Change-Id: Ib4670a8e4685a9f9bd933ccba9878bd59ccb6059
Christine Franks [Mon, 7 Aug 2017 21:28:35 +0000 (14:28 -0700)]
Add settings and reset operations for demo users
- Allow Global settings to be set in demo mode
- Allow Secure settings to be set by demo users
- Allow fully enabling apps for demo users
- Send enable broadcast as foreground broadcast
Bug:
62712426
Test: runtest -c \
com.android.server.devicepolicy.DevicePolicyManagerTest \
frameworks-services
Change-Id: Icd5d1eda12aa6b97bd4770713710a982bb0fc8e5
TreeHugger Robot [Thu, 10 Aug 2017 02:17:48 +0000 (02:17 +0000)]
Merge "Don't lock down system user in demo mode" into oc-dr1-dev
Phil Weaver [Thu, 10 Aug 2017 00:45:55 +0000 (00:45 +0000)]
Merge "Fix source for PiP hover accessibility events" into oc-dr1-dev am:
a4b5e0893f
am:
68cf0f4df8
Change-Id: I07557639eba9db23ca2a5f3fcd3faef2a7038e3b
Takashi Furukawa [Thu, 10 Aug 2017 00:42:21 +0000 (00:42 +0000)]
Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-dr1-dev am:
b9a56a4af7 -s ours
am:
be8e7f7e57 -s ours
Change-Id: I3039400b3469a8a168f27e805ca4f70f31569985
Phil Weaver [Thu, 10 Aug 2017 00:29:32 +0000 (00:29 +0000)]
Merge "Merge "Fix source for PiP hover accessibility events" into oc-dr1-dev am:
a4b5e0893f" into oc-mr1-dev
am:
794d663e42
Change-Id: I8f949e684519ec8da69c9b72ec23c396ba6e31c4
Makoto Onuki [Thu, 10 Aug 2017 00:26:35 +0000 (00:26 +0000)]
Merge "DropBoxManagerService: Don't store redundant information" into oc-mr1-dev
am:
75590ffa84
Change-Id: Id0037c455e0e37f7896d06aeedda9b7cdca35f63
Android Build Merger (Role) [Thu, 10 Aug 2017 00:21:24 +0000 (00:21 +0000)]
Merge "Merge "Fix source for PiP hover accessibility events" into oc-dr1-dev am:
a4b5e0893f" into oc-mr1-dev
Phil Weaver [Thu, 10 Aug 2017 00:19:07 +0000 (00:19 +0000)]
Merge "Fix source for PiP hover accessibility events" into oc-dr1-dev
am:
a4b5e0893f
Change-Id: I125f80e800d04e7406fcd380bce2666b5b9e5a3f
Phil Weaver [Thu, 10 Aug 2017 00:19:04 +0000 (00:19 +0000)]
Merge "Fix source for PiP hover accessibility events" into oc-dr1-dev
am:
a4b5e0893f
Change-Id: I5e79cbadd085c2ce3eacae628388ce13bdded508
TreeHugger Robot [Thu, 10 Aug 2017 00:18:56 +0000 (00:18 +0000)]
Merge "DropBoxManagerService: Don't store redundant information" into oc-mr1-dev
Dianne Hackborn [Tue, 8 Aug 2017 22:50:31 +0000 (15:50 -0700)]
Go: add features for low ram / normal ram devices.
Automatically populated from ActivityManager.isLowRamDevice().
Test: manual
Change-Id: I027b8ae0205c9793a91ffdd2635479610a62aff9
Phil Weaver [Thu, 10 Aug 2017 00:13:04 +0000 (00:13 +0000)]
Merge "Fix source for PiP hover accessibility events" into oc-dr1-dev
Vinay Kalia [Wed, 9 Aug 2017 23:53:41 +0000 (23:53 +0000)]
Merge "Fix BLE scan leaks" into oc-mr1-dev
am:
9beb5e4526
Change-Id: I92a689f0320d195730185d412b2070b4e5a2b620
TreeHugger Robot [Wed, 9 Aug 2017 23:45:13 +0000 (23:45 +0000)]
Merge "Fix BLE scan leaks" into oc-mr1-dev
Android Build Merger (Role) [Wed, 9 Aug 2017 23:44:03 +0000 (23:44 +0000)]
Merge "Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-dr1-dev am:
b9a56a4af7 -s ours am:
246d02d606 -s ours" into oc-mr1-dev-plus-aosp
Takashi Furukawa [Wed, 9 Aug 2017 23:40:09 +0000 (23:40 +0000)]
Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-dr1-dev am:
b9a56a4af7 -s ours
am:
246d02d606 -s ours
Change-Id: I21efcecd2833b37f31f19cd88fe814354e59c128
Android Build Merger (Role) [Wed, 9 Aug 2017 23:38:38 +0000 (23:38 +0000)]
Merge "Merge "Revert multi-package APK flag to off." into oc-mr1-dev am:
478f94ba7f" into oc-mr1-dev-plus-aosp
Garry Boyer [Wed, 9 Aug 2017 23:36:59 +0000 (23:36 +0000)]
Merge "Revert multi-package APK flag to off." into oc-mr1-dev
am:
478f94ba7f
Change-Id: Iaff100a533b0d357135422291c5f10613c936454
Andrii Kulian [Wed, 9 Aug 2017 23:35:54 +0000 (23:35 +0000)]
Merge "Merge "Don't set inset frame for letterboxed app in fullscreen" into oc-dr1-dev am:
7afbe54e0d" into oc-dr1-dev-plus-aosp
am:
7168ea4883
Change-Id: I9da054aa60a6453cdaf1440f9a5756c1fbeea1cb
Andrii Kulian [Wed, 9 Aug 2017 23:32:47 +0000 (23:32 +0000)]
Merge "Don't set inset frame for letterboxed app in fullscreen" into oc-dr1-dev am:
7afbe54e0d
am:
2d6fe2f5af
Change-Id: If990ce04a7c0657763fb3a58185ffb690bd8edc7
Erik Kline [Wed, 9 Aug 2017 23:30:43 +0000 (23:30 +0000)]
Merge "Merge "Add future consideration for USB rndis notification handling" am:
4263a5ed58 am:
6ff0730158 am:
ff14dd1274 -s ours" into oc-dr1-dev-plus-aosp
am:
cd7c555aa9 -s ours
Change-Id: Ice16f855095aed362a04a33cca03a9a24b65a233
Takashi Furukawa [Wed, 9 Aug 2017 23:28:41 +0000 (23:28 +0000)]
Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-dr1-dev
am:
b9a56a4af7 -s ours
Change-Id: Ib675b2f620cb2a3f57aa1ad3f1cbe891d24102e4
Derek Sollenberger [Wed, 9 Aug 2017 23:27:41 +0000 (23:27 +0000)]
Merge "Support copying from index8 into another index8." into oc-dr1-dev am:
f112fde96d
am:
519d4f4a05 -s ours
Change-Id: Icc3e4c36b5307df23144e6b2a42f1e2995817b70
Takashi Furukawa [Wed, 9 Aug 2017 23:27:40 +0000 (23:27 +0000)]
Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-dr1-dev
am:
b9a56a4af7 -s ours
Change-Id: I29dae91c1eea2fbc1619fea180be942c9ef3bc35
Hall Liu [Wed, 9 Aug 2017 23:16:44 +0000 (16:16 -0700)]
Hide the SEND_EMBMS_INTENTS permission
Bug:
64340162
Change-Id: Ia9370c0e80bb3a99df5008febc994846204272c1
Garry Boyer [Wed, 9 Aug 2017 23:24:28 +0000 (23:24 +0000)]
Merge "Revert multi-package APK flag to off." into oc-mr1-dev
Rebecca Silberstein [Wed, 9 Aug 2017 23:23:17 +0000 (23:23 +0000)]
Merge "WifiManager: update docs on setWifiEnabled" into oc-dr1-dev am:
54233f96d7
am:
c7b3933515
Change-Id: I49fe4583d246c4531cf77154ce333f653d6c88b2
Android Build Merger (Role) [Wed, 9 Aug 2017 23:20:49 +0000 (23:20 +0000)]
Merge "Merge "Update isWiredHeadsetOn() to support USB headsets." into oc-dr1-dev am:
75384f617d am:
241100cb87" into oc-mr1-dev-plus-aosp
Paul Mclean [Wed, 9 Aug 2017 23:19:08 +0000 (23:19 +0000)]
Merge "Update isWiredHeadsetOn() to support USB headsets." into oc-dr1-dev am:
75384f617d
am:
241100cb87
Change-Id: I09b41b2aebd89cfd42c956aad419eec49d0f9c3d
Android Build Merger (Role) [Wed, 9 Aug 2017 23:18:36 +0000 (23:18 +0000)]
Merge "Merge "Merge "Fix BLE scan leaks" into oc-dev am:
6e749c392b am:
3e832cf58e" into oc-dr1-dev-plus-aosp am:
411e110abb" into oc-mr1-dev-plus-aosp
Vinay Kalia [Wed, 9 Aug 2017 23:17:08 +0000 (23:17 +0000)]
Merge "Merge "Fix BLE scan leaks" into oc-dev am:
6e749c392b am:
3e832cf58e" into oc-dr1-dev-plus-aosp
am:
411e110abb
Change-Id: Iefe51aac24db2bda872dfe9908be5bc6dd8efa37
Android Build Merger (Role) [Wed, 9 Aug 2017 23:16:22 +0000 (23:16 +0000)]
Merge "Merge "Fix BLE scan leaks" into oc-dev am:
6e749c392b am:
1199972de1 am:
e9f727dd75" into oc-mr1-dev-plus-aosp
Vinay Kalia [Wed, 9 Aug 2017 23:14:54 +0000 (23:14 +0000)]
Merge "Fix BLE scan leaks" into oc-dev am:
6e749c392b am:
1199972de1
am:
e9f727dd75
Change-Id: I20a7389f634cc11e4d2b946504f4147b8b72b13b
Android Build Merger (Role) [Wed, 9 Aug 2017 23:14:29 +0000 (23:14 +0000)]
Merge "Merge "Worked around a bug where the a group child could be leaked" into oc-dr1-dev am:
f89e462bc7 am:
bbd80c9f73" into oc-mr1-dev-plus-aosp
OSDN Git Service
