OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "FRP: clear FRP when setup complete if not set up" into oc-mr1-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

7 years agoMerge "FRP: clear FRP when setup complete if not set up" into oc-mr1-dev
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

7 years agoMerge "Fix the strings accordingly for policy transparency dialogs" 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

7 years agoMerge "Fix the strings accordingly for policy transparency dialogs" into oc-mr1-dev
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

7 years agoMerge "Remove preloaded media route resources" into oc-mr1-dev
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

7 years agoMerge "Remove preloaded media route resources" into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 03:00:21 +0000 (03:00 +0000)]
Merge "Remove preloaded media route resources" into oc-mr1-dev

7 years agoMerge "Removed isUserStoppingOrShuttingDownLocked" 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

7 years agoMerge "Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev...
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

7 years agoMerge "Removed isUserStoppingOrShuttingDownLocked" into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 01:28:01 +0000 (01:28 +0000)]
Merge "Removed isUserStoppingOrShuttingDownLocked" into oc-mr1-dev

7 years agoMerge "Merge "Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc...
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

7 years agoMerge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev am: cad75...
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

7 years agoMerge "Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev...
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

7 years agoMerge "Merge "DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs...
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

7 years agoMerge "Merge "Change IMS callback AIDLs to be oneway" am: a46600e0e7 am: 44da663308...
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

7 years agoMerge "DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs." into...
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

7 years agoMerge "Change IMS callback AIDLs to be oneway" am: a46600e0e7 am: 44da663308 am:...
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

7 years agoMerge "Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev...
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

7 years agoMerge "FP permission checks should not crash system process" into oc-mr1-dev
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

7 years agoMerge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev
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

7 years agoMerge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev
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

7 years agoMerge "Change IMS callback AIDLs to be oneway" am: a46600e0e7 am: 44da663308
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

7 years agoMerge "DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs." into...
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

7 years agoMerge "FP permission checks should not crash system process" 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

7 years agoMerge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-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

7 years agoMerge "Change IMS callback AIDLs to be oneway" am: a46600e0e7
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

7 years agoMerge "ScopedUtfChars: use proper nativehelper headers" into oc-dr1-dev-plus-aosp
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

7 years agoMerge "Change IMS callback AIDLs to be oneway"
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

7 years agoMerge "ScopedUtfChars: use proper nativehelper headers" into oc-dr1-dev-plus-aosp
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

7 years agoMerge "Change IMS callback AIDLs to be oneway"
Treehugger Robot [Fri, 11 Aug 2017 00:31:41 +0000 (00:31 +0000)]
Merge "Change IMS callback AIDLs to be oneway"

7 years agoMerge "Add method that checks the Binder status of ImsConfig" am: 6ffc855e8d am:...
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

7 years agoMerge "Add method that checks the Binder status of ImsConfig" am: 6ffc855e8d am:...
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

7 years agoRemove preloaded media route resources
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

7 years agoChange IMS callback AIDLs to be oneway
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

7 years agoMerge "Add method that checks the Binder status of ImsConfig" am: 6ffc855e8d
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

7 years agoMerge "Update ConnOnActivityStartTest to be hermetic." into oc-mr1-dev
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

7 years agoMerge "Add method that checks the Binder status of ImsConfig"
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

7 years agoMerge "Merge "Stop focusing views before layout." into oc-dr1-dev am: a5dab05b61...
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

7 years agoScopedUtfChars: use proper nativehelper headers
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

7 years agoMerge "Stop focusing views before layout." into oc-dr1-dev am: a5dab05b61
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

7 years agoMerge "Stop focusing views before layout." into oc-dr1-dev am: a5dab05b61
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

7 years agoMerge "Update ConnOnActivityStartTest to be hermetic." into oc-mr1-dev
Sudheer Shanka [Thu, 10 Aug 2017 22:52:40 +0000 (22:52 +0000)]
Merge "Update ConnOnActivityStartTest to be hermetic." into oc-mr1-dev

7 years agoMerge "Add method that checks the Binder status of ImsConfig"
Brad Ebinger [Thu, 10 Aug 2017 22:50:45 +0000 (22:50 +0000)]
Merge "Add method that checks the Binder status of ImsConfig"

7 years agoMerge "Stop focusing views before layout." into oc-dr1-dev
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

7 years agoMerge "Stop focusing views before layout." into oc-dr1-dev
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

7 years agoDO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs.
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

7 years agoMerge "Stop focusing views before layout." into oc-dr1-dev
Phil Weaver [Thu, 10 Aug 2017 22:34:03 +0000 (22:34 +0000)]
Merge "Stop focusing views before layout." into oc-dr1-dev

7 years agoMerge "Delete all ro.hwui.* props" into oc-mr1-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

7 years agoMerge "Delete all ro.hwui.* props" into oc-mr1-dev
John Reck [Thu, 10 Aug 2017 21:57:02 +0000 (21:57 +0000)]
Merge "Delete all ro.hwui.* props" into oc-mr1-dev

7 years agoFix CTS, Remove CONFIGURE_ASSIST_GESTURE permission
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

7 years agoMerge "SharedMemory API changes" into oc-mr1-dev
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

7 years agoMerge "SharedMemory API changes" into oc-mr1-dev
TreeHugger Robot [Thu, 10 Aug 2017 19:41:53 +0000 (19:41 +0000)]
Merge "SharedMemory API changes" into oc-mr1-dev

7 years agoMerge "Added focus behavior changes to Build.VERSION documentation." 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

7 years agoStop focusing views before layout.
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

7 years agoMerge "Added focus behavior changes to Build.VERSION documentation." into oc-mr1-dev
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

7 years agoMerge "CharSequenceTransformation should not change anything when comparision fails...
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

7 years agoMerge "CharSequenceTransformation should not change anything when comparision fails...
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

7 years agoMerge "Hide the SEND_EMBMS_INTENTS permission" 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

7 years agoMerge "Hide the SEND_EMBMS_INTENTS permission" into oc-mr1-dev
Hall Liu [Thu, 10 Aug 2017 18:20:47 +0000 (18:20 +0000)]
Merge "Hide the SEND_EMBMS_INTENTS permission" into oc-mr1-dev

7 years agoMerge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-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

7 years agoMerge "Merge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1...
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

7 years agoMerge "Merge "The method of parseEfSpdi does not match TS24008." am: cd03d0db9d am...
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

7 years agoMerge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev...
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

7 years agoMerge "The method of parseEfSpdi does not match TS24008." am: cd03d0db9d am: cfbd4a35...
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

7 years agoMerge "Merge "Get isim card data use subId." am: 854edcff16 am: 3466cda3d7 am: 1a808f...
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

7 years agoMerge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev
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

7 years agoMerge "Low battery notification has unique sound." into oc-mr1-dev
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

7 years agoMerge "Get isim card data use subId." am: 854edcff16 am: 3466cda3d7 am: 1a808fc019
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

7 years agoMerge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev
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

7 years agoMerge "Low battery notification has unique sound." into oc-mr1-dev
TreeHugger Robot [Thu, 10 Aug 2017 17:37:05 +0000 (17:37 +0000)]
Merge "Low battery notification has unique sound." into oc-mr1-dev

7 years agoMerge "The method of parseEfSpdi does not match TS24008." am: cd03d0db9d am: cfbd4a354a
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

7 years agoMerge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev
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

7 years agoMerge "Get isim card data use subId." am: 854edcff16 am: 3466cda3d7
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

7 years agoDelete all ro.hwui.* props
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)

7 years agoMerge "Localization of zen mode default rules." into oc-mr1-dev
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

7 years agoMerge "Localization of zen mode default rules." into oc-mr1-dev
TreeHugger Robot [Thu, 10 Aug 2017 16:41:36 +0000 (16:41 +0000)]
Merge "Localization of zen mode default rules." into oc-mr1-dev

7 years agoMerge "The method of parseEfSpdi does not match TS24008." am: cd03d0db9d
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

7 years agoMerge "Get isim card data use subId." am: 854edcff16
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

7 years agoMerge "The method of parseEfSpdi does not match TS24008."
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

7 years agoMerge "Get isim card data use subId."
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

7 years agoMerge "The method of parseEfSpdi does not match TS24008."
Amit Mahajan [Thu, 10 Aug 2017 15:59:43 +0000 (15:59 +0000)]
Merge "The method of parseEfSpdi does not match TS24008."

7 years agoMerge "Get isim card data use subId."
Amit Mahajan [Thu, 10 Aug 2017 15:57:38 +0000 (15:57 +0000)]
Merge "Get isim card data use subId."

7 years agoRevert "Initial support for proposed android.net.lowpan"
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

7 years agoMerge "ClassLoaderFactory: Correct broken refactoring from change 19da1cf72e8." into...
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

7 years agoMerge "ClassLoaderFactory: Correct broken refactoring from change 19da1cf72e8." into...
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

7 years agoMerge "Fix handling of @removed APIs." 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

7 years agoMerge "Fix handling of @removed APIs." into oc-mr1-dev
Jeff Sharkey [Thu, 10 Aug 2017 15:18:58 +0000 (15:18 +0000)]
Merge "Fix handling of @removed APIs." into oc-mr1-dev

7 years agoFix the strings accordingly for policy transparency dialogs
Tony Mak [Thu, 10 Aug 2017 14:41:12 +0000 (15:41 +0100)]
Fix the strings accordingly for policy transparency dialogs

Bug: 64555046

Test: Built and observe the strings.

Change-Id: If0343d701dee24d392b0578131e50b9002433a9b

7 years agoClassLoaderFactory: Correct broken refactoring from change 19da1cf72e8.
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

7 years agoMerge "PackageParser: Parse android:classLoader during the full parse." into oc-mr1-dev
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

7 years agoMerge "PackageParser: Parse android:classLoader during the full parse." into oc-mr1-dev
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

7 years agoMerge "Merge "Remove config_demoModePackage resource" into oc-dr1-dev am: 934a1081fe...
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

7 years agoMerge "Remove config_demoModePackage resource" into oc-dr1-dev am: 934a1081fe
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

7 years agoMerge "Remove config_demoModePackage resource" into oc-dr1-dev am: 934a1081fe
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

7 years agoMerge "Remove config_demoModePackage resource" into oc-dr1-dev
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

7 years agoMerge "Remove config_demoModePackage resource" into oc-dr1-dev
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

7 years agoMerge "Add permission check before setMain()" into oc-mr1-dev
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

7 years agoMerge "Remove config_demoModePackage resource" into oc-dr1-dev
TreeHugger Robot [Thu, 10 Aug 2017 06:42:32 +0000 (06:42 +0000)]
Merge "Remove config_demoModePackage resource" into oc-dr1-dev

7 years agoMerge "Add permission check before setMain()" into oc-mr1-dev
TreeHugger Robot [Thu, 10 Aug 2017 06:39:31 +0000 (06:39 +0000)]
Merge "Add permission check before setMain()" into oc-mr1-dev

7 years agoMerge "Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev am: 256fe97...
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

7 years agoMerge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev am: 256fe97329
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