OSDN Git Service
Julia Reynolds [Fri, 11 Aug 2017 16:36:54 +0000 (16:36 +0000)]
Merge "Group new free notis if autogroup summary exists" into oc-mr1-dev
am:
b4472f4bde
Change-Id: I2f59a6c174a9ab43cb91f9636755b5bbe7f68669
TreeHugger Robot [Fri, 11 Aug 2017 16:22:59 +0000 (16:22 +0000)]
Merge "Group new free notis if autogroup summary exists" into oc-mr1-dev
Philipp Weiß [Fri, 11 Aug 2017 15:39:37 +0000 (15:39 +0000)]
Merge "Dismiss SystemUIDialogs on ACTION_CLOSE_SYSTEM_DIALOGS" into oc-mr1-dev
am:
7aab318c96
Change-Id: Ic28442491b56012b2c5993754d623ba7203cfa59
Philipp Weiß [Fri, 11 Aug 2017 15:33:05 +0000 (15:33 +0000)]
Merge "Dismiss SystemUIDialogs on ACTION_CLOSE_SYSTEM_DIALOGS" into oc-mr1-dev
Android Build Merger (Role) [Fri, 11 Aug 2017 13:07:27 +0000 (13:07 +0000)]
Merge "Merge "Enforce policy for camera gesture in keyguard" into oc-dev am:
49bef543b3 -s ours am:
b6ba151a6f -s ours am:
f4e45257c8 -s ours" into oc-mr1-dev-plus-aosp
Esteban Talavera [Fri, 11 Aug 2017 13:03:01 +0000 (13:03 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am:
49bef543b3 -s ours am:
b6ba151a6f -s ours
am:
f4e45257c8 -s ours
Change-Id: Iee95196f7015c375f9d8c92ff1950d104cf98de5
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:36 +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: Idc2edc2fe727a5054c2bafb2ab01cbdfdc5a9d71
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
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 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
phweiss [Wed, 5 Jul 2017 16:54:54 +0000 (18:54 +0200)]
Dismiss SystemUIDialogs on ACTION_CLOSE_SYSTEM_DIALOGS
This fixes the bug where different dialogs can appear
over the ambient screen or the Recent Apps screen.
Bug:
63286397
Test: manual, runtest systemui
Change-Id: I86d0cdd3d30e0ea8cbdae2dc220e1f988cf6decb
(cherry picked from commit
679dc2492ce1286a44c9dcd60e18dc97dd886a0a)
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:00:21 +0000 (03:00 +0000)]
Merge "Remove preloaded media route resources" into oc-mr1-dev
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
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
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
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: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
Julia Reynolds [Thu, 10 Aug 2017 20:58:54 +0000 (16:58 -0400)]
Group new free notis if autogroup summary exists
In the case where an app posted enough notifications to
get an autogrpup summary, but then canceled most of them,
add all new group-less notifications to the autogroup summary
even if the total number of notifications currently posted
by the app is < the autogroup trigger number
Test: runtest systemui-notification, cts
Change-Id: I6f7a8a0140abcff2b0f78eacfbf23cfab12897fa
Fixes:
64158706
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 19:53:25 +0000 (19:53 +0000)]
Merge "SharedMemory API changes" into oc-mr1-dev
am:
edf3384307
Change-Id: Ib5f641f37e73fc6b236fe90c229bb3855025375c
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 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
John Reck [Mon, 17 Jul 2017 16:55:02 +0000 (09:55 -0700)]
Delete all ro.hwui.* props
Remove all ro.hwui.* tuning props and instead
calculate them from the screen resolution.
Or just hardcode them to what all devices
were hardcoding them to anyway.
Bug:
63741221
Test: Check cache size results on sailfish
Change-Id: I8b0d210572a246f4fefb076935cf5156a70c274c
Merged-In: I8b0d210572a246f4fefb076935cf5156a70c274c
(cherry picked from commit
8dc02f99d09130ace2ee738c2e689db1b3f33181)
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
OSDN Git Service
