OSDN Git Service
Esteban Talavera [Fri, 11 Aug 2017 13:19:35 +0000 (13:19 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am:
49bef543b3 -s ours am:
b6ba151a6f -s ours am:
d9d5d43f89 -s ours
am:
ff19365761 -s ours
Change-Id: I60fd8db5104d86ac6c437fbf1d67a6675450ec3a
Esteban Talavera [Fri, 11 Aug 2017 13:09:12 +0000 (13:09 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am:
49bef543b3 am:
e50bea8662 -s ours am:
4879880724 -s ours
am:
84c9c5c400 -s ours
Change-Id: I10b1d89d681e341e6b9fd35d9b604c43c7cc2bd3
Esteban Talavera [Fri, 11 Aug 2017 13:03:00 +0000 (13:03 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am:
49bef543b3 -s ours am:
b6ba151a6f -s ours
am:
d9d5d43f89 -s ours
Change-Id: I8a1b01e124ac1e368c90702d93d5c4fc8b2572d7
Esteban Talavera [Fri, 11 Aug 2017 12:54:40 +0000 (12:54 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am:
49bef543b3 am:
e50bea8662 -s ours
am:
4879880724 -s ours
Change-Id: I0ee0c9ea7a6647830352f44499ad3f5fcc81c817
Esteban Talavera [Fri, 11 Aug 2017 12:50:34 +0000 (12:50 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am:
49bef543b3 -s ours
am:
b6ba151a6f -s ours
Change-Id: Ie26efb399e409d4ca90b434f9dbe6ee648d08c36
Esteban Talavera [Fri, 11 Aug 2017 12:42:59 +0000 (12:42 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am:
49bef543b3
am:
e50bea8662 -s ours
Change-Id: I95659fa0abcfa619a88cb2d3d0e6d2ede4186a53
Esteban Talavera [Fri, 11 Aug 2017 12:34:06 +0000 (12:34 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev
am:
49bef543b3
Change-Id: I0183d9fb699f38af155c3684cc74daa875c22ec4
Esteban Talavera [Fri, 11 Aug 2017 12:34:00 +0000 (12:34 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev
am:
49bef543b3 -s ours
Change-Id: I69369945e8fc5c1090c8ee217b5d193f5fb1236d
Adrian Roos [Fri, 11 Aug 2017 12:33:58 +0000 (12:33 +0000)]
Merge "FRP: clear FRP when setup complete if not set up" into oc-mr1-dev am:
3d558d8dd8
am:
8eecb09d40
Change-Id: Ic5f283ab6958d71869c4e98d4cd934438a0d73b8
TreeHugger Robot [Fri, 11 Aug 2017 12:25:01 +0000 (12:25 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev
Adrian Roos [Fri, 11 Aug 2017 12:20:21 +0000 (12:20 +0000)]
Merge "FRP: clear FRP when setup complete if not set up" into oc-mr1-dev
am:
3d558d8dd8
Change-Id: I2a05c3b5cbfe1f8bbd92ac85bc7544ab2c18b177
TreeHugger Robot [Fri, 11 Aug 2017 12:10:46 +0000 (12:10 +0000)]
Merge "FRP: clear FRP when setup complete if not set up" into oc-mr1-dev
Tony Mak [Fri, 11 Aug 2017 11:04:27 +0000 (11:04 +0000)]
Merge "Fix the strings accordingly for policy transparency dialogs" into oc-mr1-dev am:
106dc34fb2
am:
5d5d865dc8
Change-Id: If49e70eb961731a2bb5b8ecb5313fd52346612db
Tony Mak [Fri, 11 Aug 2017 10:51:49 +0000 (10:51 +0000)]
Merge "Fix the strings accordingly for policy transparency dialogs" into oc-mr1-dev
am:
106dc34fb2
Change-Id: I9dd602dd5cb0e6a5d11f22fd8ffd1b3b6efdf471
TreeHugger Robot [Fri, 11 Aug 2017 10:42:24 +0000 (10:42 +0000)]
Merge "Fix the strings accordingly for policy transparency dialogs" into oc-mr1-dev
Philipp Weiß [Fri, 11 Aug 2017 10:21:51 +0000 (10:21 +0000)]
Merge "Dismiss SystemUIDialogs on ACTION_CLOSE_SYSTEM_DIALOGS"
Christofer Åkersten [Fri, 11 Aug 2017 04:13:30 +0000 (04:13 +0000)]
Merge "Remove preloaded media route resources" into oc-mr1-dev am:
a6d62d7b8d
am:
37e9acb65a
Change-Id: I3acd3ebc74f91ab4be64101f1823112bb8a87d09
Fyodor Kupolov [Fri, 11 Aug 2017 04:09:21 +0000 (04:09 +0000)]
Merge "Removed isUserStoppingOrShuttingDownLocked" into oc-mr1-dev am:
0ee1e6d3c1
am:
a468827851
Change-Id: If40c52095c8aedcf87abdeae553d3eda46bbf396
Kevin Chyn [Fri, 11 Aug 2017 03:58:34 +0000 (03:58 +0000)]
Merge "Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev am:
cad75e2437 am:
acdaaea57e" into oc-mr1-dev-plus-aosp
am:
0650482c2d
Change-Id: Ifc9fc8107ac2b6b3f938df60b36820b2577a4b5f
Kevin Chyn [Fri, 11 Aug 2017 03:54:25 +0000 (03:54 +0000)]
Merge "Merge "Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev am:
cad75e2437" into oc-dr1-dev-plus-aosp am:
fa6fb4c068" into oc-mr1-dev-plus-aosp
am:
a45277bb2a
Change-Id: I0f726bb78fd565935493dbb15148c4780fe482e8
Sudheer Shanka [Fri, 11 Aug 2017 03:50:40 +0000 (03:50 +0000)]
Merge "Merge "DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs." into oc-mr1-dev am:
3cb64c2c51" into oc-mr1-dev-plus-aosp
am:
ffb30680aa -s ours
Change-Id: I3fb6eb6123ce416097ffb7933ea0830660a83c9d
Brad Ebinger [Fri, 11 Aug 2017 03:43:49 +0000 (03:43 +0000)]
Merge "Merge "Change IMS callback AIDLs to be oneway" am:
a46600e0e7 am:
44da663308 am:
c6edfb16ac -s ours am:
d061c2dde0 -s ours" into oc-mr1-dev-plus-aosp
am:
0778f438a1 -s ours
Change-Id: Id9bdc970a75b158cd1943223ecd88caac4c7b6f0
Kevin Chyn [Fri, 11 Aug 2017 03:39:17 +0000 (03:39 +0000)]
Merge "FP permission checks should not crash system process" into oc-mr1-dev am:
5f2ba81c06
am:
cc5c844c1f
Change-Id: Ic8e5053183034fb14a854b15a6913d727fe1a76c
Steven Moreland [Fri, 11 Aug 2017 03:34:50 +0000 (03:34 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers" into oc-dr1-dev-plus-aosp am:
1e8d712b78
am:
350b0ed191
Change-Id: I79194ce726ed314cc7d6c87d4a3ea4b0e12a7542
Brad Ebinger [Fri, 11 Aug 2017 03:26:36 +0000 (03:26 +0000)]
Merge "Add method that checks the Binder status of ImsConfig" am:
6ffc855e8d am:
bc13df8ce8 am:
3fff521160 -s ours am:
f4f815c2cb -s ours
am:
ad7e491494 -s ours
Change-Id: If774854694d9bcfac7902766cf32f936d04e6530
Sudheer Shanka [Fri, 11 Aug 2017 03:22:38 +0000 (03:22 +0000)]
Merge "Update ConnOnActivityStartTest to be hermetic." into oc-mr1-dev am:
06668b5f73
am:
d732136ed1
Change-Id: Iff9111b3d1e3af576de8327e7fe0fdddf7bcadb1
Phil Weaver [Fri, 11 Aug 2017 03:18:57 +0000 (03:18 +0000)]
Merge "Merge "Stop focusing views before layout." into oc-dr1-dev am:
a5dab05b61 am:
2436cb76b9" into oc-mr1-dev-plus-aosp
am:
88f3cb403e
Change-Id: I0ef52270bcb26add67892b6c9d64d010e9e8751b
Christofer Åkersten [Fri, 11 Aug 2017 03:10:54 +0000 (03:10 +0000)]
Merge "Remove preloaded media route resources" into oc-mr1-dev
am:
a6d62d7b8d
Change-Id: I7aefc986591b5ee379a121b10a6fcca9d1929fef
TreeHugger Robot [Fri, 11 Aug 2017 03:04:02 +0000 (03:04 +0000)]
Merge "resolve merge conflicts of
b90e2c85c06f to master"
TreeHugger Robot [Fri, 11 Aug 2017 03:00:21 +0000 (03:00 +0000)]
Merge "Remove preloaded media route resources" into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 02:43:53 +0000 (02:43 +0000)]
Merge "Update GeomagneticField parameters according to WMM-2015"
Sudheer Shanka [Fri, 11 Aug 2017 01:40:44 +0000 (01:40 +0000)]
Merge "Update NPMS.setRestrictBackgroundUL to notify listeners."
Fyodor Kupolov [Fri, 11 Aug 2017 01:38:24 +0000 (01:38 +0000)]
Merge "Removed isUserStoppingOrShuttingDownLocked" into oc-mr1-dev
am:
0ee1e6d3c1
Change-Id: I8c22fb94b4e59426b8832a4bae5d2717090256d2
Sudheer Shanka [Fri, 11 Aug 2017 01:36:29 +0000 (01:36 +0000)]
Merge "Update network rules only for the added/removed appId in the whitelist."
Android Build Merger (Role) [Fri, 11 Aug 2017 01:32:30 +0000 (01:32 +0000)]
Merge "Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev am:
cad75e2437 am:
acdaaea57e" into oc-mr1-dev-plus-aosp
TreeHugger Robot [Fri, 11 Aug 2017 01:28:01 +0000 (01:28 +0000)]
Merge "Removed isUserStoppingOrShuttingDownLocked" into oc-mr1-dev
Android Build Merger (Role) [Fri, 11 Aug 2017 01:27:39 +0000 (01:27 +0000)]
Merge "Merge "Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev am:
cad75e2437" into oc-dr1-dev-plus-aosp am:
fa6fb4c068" into oc-mr1-dev-plus-aosp
Kevin Chyn [Fri, 11 Aug 2017 01:26:47 +0000 (01:26 +0000)]
Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev am:
cad75e2437
am:
acdaaea57e
Change-Id: Ibb15331f28dbe105e7febdead34a752ff6328247
Kevin Chyn [Fri, 11 Aug 2017 01:22:43 +0000 (01:22 +0000)]
Merge "Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev am:
cad75e2437" into oc-dr1-dev-plus-aosp
am:
fa6fb4c068
Change-Id: I72ad306a62e999cb15b469887371a1d950228fbf
Android Build Merger (Role) [Fri, 11 Aug 2017 01:22:10 +0000 (01:22 +0000)]
Merge "Merge "DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs." into oc-mr1-dev am:
3cb64c2c51" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 11 Aug 2017 01:20:05 +0000 (01:20 +0000)]
Merge "Merge "Change IMS callback AIDLs to be oneway" am:
a46600e0e7 am:
44da663308 am:
c6edfb16ac -s ours am:
d061c2dde0 -s ours" into oc-mr1-dev-plus-aosp
Sudheer Shanka [Fri, 11 Aug 2017 01:18:34 +0000 (01:18 +0000)]
Merge "DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs." into oc-mr1-dev
am:
3cb64c2c51
Change-Id: I80f8971b0f0f55ce91a0e1a3d574ae4a577f9257
Brad Ebinger [Fri, 11 Aug 2017 01:15:52 +0000 (01:15 +0000)]
Merge "Change IMS callback AIDLs to be oneway" am:
a46600e0e7 am:
44da663308 am:
c6edfb16ac -s ours
am:
d061c2dde0 -s ours
Change-Id: If094587b044bcf7c1d025dd914fd8b1f37e0865f
Android Build Merger (Role) [Fri, 11 Aug 2017 01:12:50 +0000 (01:12 +0000)]
Merge "Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev am:
cad75e2437" into oc-dr1-dev-plus-aosp
Kevin Chyn [Fri, 11 Aug 2017 01:11:41 +0000 (01:11 +0000)]
Merge "FP permission checks should not crash system process" into oc-mr1-dev
am:
5f2ba81c06
Change-Id: Iaa0c94a9325ef944ddb6b62c2e80e39ef3bbb21a
Kevin Chyn [Fri, 11 Aug 2017 01:09:34 +0000 (01:09 +0000)]
Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev
am:
cad75e2437
Change-Id: Ib609a68d8da9eab5e4993565c61aec9ea6b1ba35
Kevin Chyn [Fri, 11 Aug 2017 01:08:09 +0000 (01:08 +0000)]
Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev
am:
cad75e2437
Change-Id: Iff57ca1a3b59517218085239e23c68a4315230e1
Phil Weaver [Fri, 11 Aug 2017 01:07:33 +0000 (18:07 -0700)]
resolve merge conflicts of
b90e2c85c06f to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iea5014345e8a1efd9a30cd8bb18684bdc310ac85
Brad Ebinger [Fri, 11 Aug 2017 01:07:31 +0000 (01:07 +0000)]
Merge "Change IMS callback AIDLs to be oneway" am:
a46600e0e7 am:
44da663308
am:
c6edfb16ac -s ours
Change-Id: I0d3fd87e85541df08541ea3a16dd2ae3b32d9941
Sudheer Shanka [Fri, 11 Aug 2017 01:05:43 +0000 (01:05 +0000)]
Merge "DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs." into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 01:01:58 +0000 (01:01 +0000)]
Merge "FP permission checks should not crash system process" into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 00:59:08 +0000 (00:59 +0000)]
Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev
Brad Ebinger [Fri, 11 Aug 2017 00:55:01 +0000 (00:55 +0000)]
Merge "Change IMS callback AIDLs to be oneway" am:
a46600e0e7
am:
44da663308
Change-Id: I7d68f608242c81c7be1da1c83669baf38b9e9fcc
Steven Moreland [Fri, 11 Aug 2017 00:50:50 +0000 (00:50 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers" into oc-dr1-dev-plus-aosp
am:
1e8d712b78
Change-Id: I52b50aec4319183bebacaf7fb03e51dd6b51157a
Brad Ebinger [Fri, 11 Aug 2017 00:42:30 +0000 (00:42 +0000)]
Merge "Change IMS callback AIDLs to be oneway"
am:
a46600e0e7
Change-Id: If849e9ed61271bf233f4e149ef766e2e7b0d7851
Ashutosh Joshi [Fri, 11 Aug 2017 00:40:33 +0000 (17:40 -0700)]
Add owners for location and context services
Adding owners for location and context services
Test: Build compiles
Change-Id: Id10fa0f33731e07b5cf36ebbe93737c7c04c8284
TreeHugger Robot [Fri, 11 Aug 2017 00:40:18 +0000 (00:40 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers" into oc-dr1-dev-plus-aosp
Treehugger Robot [Fri, 11 Aug 2017 00:31:41 +0000 (00:31 +0000)]
Merge "Change IMS callback AIDLs to be oneway"
Brad Ebinger [Thu, 10 Aug 2017 23:37:24 +0000 (23:37 +0000)]
Merge "Add method that checks the Binder status of ImsConfig" am:
6ffc855e8d am:
bc13df8ce8 am:
3fff521160 -s ours
am:
f4f815c2cb -s ours
Change-Id: Ie2e35c298bab0024cb800c8f104b82b7ca026161
Brad Ebinger [Thu, 10 Aug 2017 23:24:43 +0000 (23:24 +0000)]
Merge "Add method that checks the Binder status of ImsConfig" am:
6ffc855e8d am:
bc13df8ce8
am:
3fff521160 -s ours
Change-Id: I0bf3f2a70920df6c36741ea78220e235d6ed769a
Christofer Åkersten [Thu, 10 Aug 2017 23:04:48 +0000 (08:04 +0900)]
Remove preloaded media route resources
Remove system preloads previously removed in ag/
2549555 and mistakenly
readded in merge ag/
2691682.
Bug:
64567067
Bug:
64534957
Change-Id: I707ebf9f998aaeb472e41ebde2802db3d3f20a4d
Test: build
Brad Ebinger [Thu, 27 Jul 2017 19:57:03 +0000 (12:57 -0700)]
Change IMS callback AIDLs to be oneway
A bad behaving service was causing the IMS registration
callbacks to block indefinetly waiting for the callback
binder implementation in another process to finish. Since
we update the IMS registration in a loop, we were never getting
to the updates for the other processes.
This change moves the AIDL definition to oneway. Since these
are callback AIDLs, the caller doesn't need to wait
for the callbacks to return before sending the others.
Bug:
63137625
Test: Manual
Merged-In: I0e049166ddf3604d312748b63a94fa6ebe77c29d
Change-Id: Id39b6b70aa20bb9986bf293abe2f9e683da4252e
Brad Ebinger [Thu, 10 Aug 2017 23:11:44 +0000 (23:11 +0000)]
Merge "Add method that checks the Binder status of ImsConfig" am:
6ffc855e8d
am:
bc13df8ce8
Change-Id: I7d73cade826c47b902c875b9543cb50fb19631d9
Sudheer Shanka [Thu, 10 Aug 2017 23:06:43 +0000 (23:06 +0000)]
Merge "Update ConnOnActivityStartTest to be hermetic." into oc-mr1-dev
am:
06668b5f73
Change-Id: I34efad16363ca2b21374967bfabfc8fa2f36ee94
Brad Ebinger [Thu, 10 Aug 2017 23:02:56 +0000 (23:02 +0000)]
Merge "Add method that checks the Binder status of ImsConfig"
am:
6ffc855e8d
Change-Id: Ifa04b6260d51c17dc323fab918db0bdbf2bdea64
Android Build Merger (Role) [Thu, 10 Aug 2017 23:00:50 +0000 (23:00 +0000)]
Merge "Merge "Stop focusing views before layout." into oc-dr1-dev am:
a5dab05b61 am:
2436cb76b9" into oc-mr1-dev-plus-aosp
Steven Moreland [Thu, 10 Aug 2017 22:55:12 +0000 (15:55 -0700)]
ScopedUtfChars: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: modules using ScopedUtfChars find headers
Bug:
63762847
Change-Id: I5e9f2b56f569b83ece0d854f7066655e1d64cc65
Phil Weaver [Thu, 10 Aug 2017 22:56:35 +0000 (22:56 +0000)]
Merge "Stop focusing views before layout." into oc-dr1-dev am:
a5dab05b61
am:
34f79a67ee
Change-Id: I4a100110f61930abbb8a501ea897359bfe064f38
Phil Weaver [Thu, 10 Aug 2017 22:56:34 +0000 (22:56 +0000)]
Merge "Stop focusing views before layout." into oc-dr1-dev am:
a5dab05b61
am:
2436cb76b9
Change-Id: I273fba5f4dc74346a83d1e63cf7759aa3b6a3070
Sudheer Shanka [Thu, 10 Aug 2017 22:52:40 +0000 (22:52 +0000)]
Merge "Update ConnOnActivityStartTest to be hermetic." into oc-mr1-dev
Brad Ebinger [Thu, 10 Aug 2017 22:50:45 +0000 (22:50 +0000)]
Merge "Add method that checks the Binder status of ImsConfig"
Phil Weaver [Thu, 10 Aug 2017 22:44:47 +0000 (22:44 +0000)]
Merge "Stop focusing views before layout." into oc-dr1-dev
am:
a5dab05b61
Change-Id: If2bbb15d9609260272d74e3fc8c7de7c9789fa2d
Phil Weaver [Thu, 10 Aug 2017 22:44:39 +0000 (22:44 +0000)]
Merge "Stop focusing views before layout." into oc-dr1-dev
am:
a5dab05b61
Change-Id: I31f4ce541ac56887549a654b5e313e1f361152c3
Sudheer Shanka [Thu, 10 Aug 2017 19:02:31 +0000 (12:02 -0700)]
DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs.
Bug:
62240247
Test: cts-tradefed run singleCommand cts-dev -m CtsIncidentHostTestCases -t \
com.android.server.cts.BatteryStatsValidationTest
Change-Id: I1328fe7bf29229e9563cde6eea80addf2b91ea5d
Phil Weaver [Thu, 10 Aug 2017 22:34:03 +0000 (22:34 +0000)]
Merge "Stop focusing views before layout." into oc-dr1-dev
John Reck [Thu, 10 Aug 2017 22:21:14 +0000 (22:21 +0000)]
Merge "Delete all ro.hwui.* props" into oc-mr1-dev am:
eb43cdbc2e
am:
27140b03bf -s ours
Change-Id: I12f5b74f6e379f37209f9a4623621b3fa3dde796
John Reck [Thu, 10 Aug 2017 22:09:13 +0000 (22:09 +0000)]
Merge "Delete all ro.hwui.* props" into oc-mr1-dev
am:
eb43cdbc2e
Change-Id: I4e3680df1f475bc6f15ff8c3ab0bdc8b887607a3
John Reck [Thu, 10 Aug 2017 21:57:02 +0000 (21:57 +0000)]
Merge "Delete all ro.hwui.* props" into oc-mr1-dev
Evan Rosky [Thu, 10 Aug 2017 20:32:03 +0000 (20:32 +0000)]
Merge "Disabled views won't receive focus"
Kevin Chyn [Thu, 10 Aug 2017 18:40:37 +0000 (11:40 -0700)]
Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission
Test: make -j56 cts
run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial <device serial>
Fixes:
64560640
Change-Id: Ic807028567da9a4f3f108121d3e36358a513cf04
John Reck [Thu, 10 Aug 2017 20:11:47 +0000 (20:11 +0000)]
Merge "SharedMemory API changes" into oc-mr1-dev am:
edf3384307
am:
20933d0454
Change-Id: I08d5eb7c5cf99c0af6f94a5f88af0ca8328c34f2
John Reck [Thu, 10 Aug 2017 19:53:25 +0000 (19:53 +0000)]
Merge "SharedMemory API changes" into oc-mr1-dev
am:
edf3384307
Change-Id: Ib5f641f37e73fc6b236fe90c229bb3855025375c
Evan Rosky [Thu, 10 Aug 2017 19:50:49 +0000 (19:50 +0000)]
Merge "Added focus behavior changes to Build.VERSION documentation." into oc-mr1-dev am:
003bd7e3ec
am:
becff025d7
Change-Id: I7440d68743098a0e9c21498c4df7980971743b05
TreeHugger Robot [Thu, 10 Aug 2017 19:41:53 +0000 (19:41 +0000)]
Merge "SharedMemory API changes" into oc-mr1-dev
Evan Rosky [Thu, 10 Aug 2017 19:33:19 +0000 (19:33 +0000)]
Merge "Added focus behavior changes to Build.VERSION documentation." into oc-mr1-dev
am:
003bd7e3ec
Change-Id: I8f7bc93c2eaab34ec2a84b4b1dde71ffb7ef5575
Phil Weaver [Thu, 10 Aug 2017 19:31:34 +0000 (12:31 -0700)]
Stop focusing views before layout.
Rolls back one line of ag/
2257919.
Bug:
63811145
Test: TalkBack no longer reads the page backwards in:
Settings > System > Reset > Factory data reset
Settings > Connected devices > Android Beam
Change-Id: I6b04e64cd650ebda193da4a54bf0721bd256820c
Evan Rosky [Thu, 10 Aug 2017 19:21:29 +0000 (19:21 +0000)]
Merge "Added focus behavior changes to Build.VERSION documentation." into oc-mr1-dev
Felipe Leme [Thu, 10 Aug 2017 19:21:09 +0000 (19:21 +0000)]
Merge "CharSequenceTransformation should not change anything when comparision fails." into oc-mr1-dev am:
0edb324403
am:
9220ae8a2e
Change-Id: I3b1797d03053a79a9f7a275e177686b6b7995f71
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
Hall Liu [Thu, 10 Aug 2017 18:56:55 +0000 (18:56 +0000)]
Merge "Hide the SEND_EMBMS_INTENTS permission" into oc-mr1-dev am:
d259d8b80f
am:
6b3ce948c6
Change-Id: Iba626fe3720d0cb1d8b714a9eed7945382a662f4
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
Ian Pedowitz [Thu, 10 Aug 2017 18:28:28 +0000 (18:28 +0000)]
Merge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev am:
0716c8e60e am:
28440ed3b9 -s ours
am:
11e1da74a9 -s ours
Change-Id: Id41ddaf5b019d88abe74e5a9468425a129eb5715
Ian Pedowitz [Thu, 10 Aug 2017 18:22:36 +0000 (18:22 +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
am:
c31af92aa9 -s ours
Change-Id: I5064fa0947387afc51ef15980ee4c8a2c00ddfb3
Hall Liu [Thu, 10 Aug 2017 18:20:47 +0000 (18:20 +0000)]
Merge "Hide the SEND_EMBMS_INTENTS permission" into oc-mr1-dev
Amit Mahajan [Thu, 10 Aug 2017 18:17:45 +0000 (18:17 +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
am:
d6fab9dae9
Change-Id: Idde114d46da5c18a9bdf13fb1580a4d3f95c0718
Amit Mahajan [Thu, 10 Aug 2017 18:10:00 +0000 (18:10 +0000)]
Merge "Merge "Get isim card data use subId." am:
854edcff16 am:
3466cda3d7 am:
1a808fc019 am:
e1e32370e2" into oc-mr1-dev-plus-aosp
am:
eacbe710dc
Change-Id: I6b2ff0bd59063d94c3e0c2df427b2037da606265
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
Beverly [Thu, 10 Aug 2017 18:03:39 +0000 (18:03 +0000)]
Merge "Low battery notification has unique sound." into oc-mr1-dev am:
9ac6be4a66
am:
ec3481b55d
Change-Id: Ic6feb4f79f2d9a7fb3334333cf54b75e616ec548
OSDN Git Service
