OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Keep scrim black when "always on" is off" into pi-dev am: 402e2a2b6f
Lucas Dupin [Mon, 21 May 2018 19:45:48 +0000 (12:45 -0700)]
Merge "Keep scrim black when "always on" is off" into pi-dev am: 402e2a2b6f
am: 1c63bdcce2

Change-Id: I38cfb0e6560e70c4a9bb66d48a18cdc5d84b89f8

6 years agoMerge "Add a shell command for IMMS to test instant apps" into pi-dev am: 711a8f7f28
Yohei Yukawa [Mon, 21 May 2018 19:40:59 +0000 (12:40 -0700)]
Merge "Add a shell command for IMMS to test instant apps" into pi-dev am: 711a8f7f28
am: 682b36a5ae

Change-Id: Ia0269a871d174e02a9d3a8a59d6f5be92cde3f9b

6 years agoMerge "Keep scrim black when "always on" is off" into pi-dev
Lucas Dupin [Mon, 21 May 2018 19:36:44 +0000 (12:36 -0700)]
Merge "Keep scrim black when "always on" is off" into pi-dev
am: 402e2a2b6f

Change-Id: Iecc4ff6e4f1861e8adec33e912d71be051ccb98d

6 years agoMerge "Add a shell command for IMMS to test instant apps" into pi-dev
Yohei Yukawa [Mon, 21 May 2018 19:29:13 +0000 (12:29 -0700)]
Merge "Add a shell command for IMMS to test instant apps" into pi-dev
am: 711a8f7f28

Change-Id: I7ac74ec1076ad7160475b9595e00db85eea9f818

6 years agoMerge "Add a field in config to disable/enable the string hashing in metric report...
Yangster-mac [Mon, 21 May 2018 19:27:13 +0000 (12:27 -0700)]
Merge "Add a field in config to disable/enable the string hashing in metric report." into pi-dev am: 76cb7fe2f6
am: 02b40158ab

Change-Id: I7445eb13283b007738182e2a5ac4808a87124a11

6 years agoMerge "Clean up Bitmap allocation size computation."
Ben Wagner [Mon, 21 May 2018 19:19:08 +0000 (19:19 +0000)]
Merge "Clean up Bitmap allocation size computation."

6 years agoMerge "ResXMLTree: Clone DynamicRefTable on creation" into pi-dev am: fd37ec90b8
Ryan Mitchell [Mon, 21 May 2018 19:06:13 +0000 (12:06 -0700)]
Merge "ResXMLTree: Clone DynamicRefTable on creation" into pi-dev am: fd37ec90b8
am: b3da3a9673

Change-Id: Ic715bc6db56328c47da4a30a3e46ea92bbf10f92

6 years agoMerge "Add a field in config to disable/enable the string hashing in metric report...
Yangster-mac [Mon, 21 May 2018 19:01:32 +0000 (12:01 -0700)]
Merge "Add a field in config to disable/enable the string hashing in metric report." into pi-dev
am: 76cb7fe2f6

Change-Id: I4bb331330c505396427bb72ff7b69c2b6653ba97

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 35426e...
Bill Yi [Mon, 21 May 2018 18:57:10 +0000 (11:57 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 35426e5e69  -s ours
am: 33ad5a99dd  -s ours

Change-Id: Ifc05f3503a635804c9008e28ccc5cf807f69905b

6 years agoMerge "ResXMLTree: Clone DynamicRefTable on creation" into pi-dev
Ryan Mitchell [Mon, 21 May 2018 18:53:56 +0000 (11:53 -0700)]
Merge "ResXMLTree: Clone DynamicRefTable on creation" into pi-dev
am: fd37ec90b8

Change-Id: I3030d62104142b33dfb9844faa2fcb9840d8ee61

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 346e04...
Bill Yi [Mon, 21 May 2018 18:43:21 +0000 (11:43 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 346e04785d  -s ours
am: 491a78548b  -s ours

Change-Id: I31e6a4d193027b9bad66d36e391bff93be6928b6

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 21 May 2018 18:42:56 +0000 (11:42 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 35426e5e69  -s ours

Change-Id: I9ca85e02a0ab28401d9c5715180e8b0323d75c30

6 years agoMerge "ActivityManager: Fix slow-app ANR dumping" am: 923208e8c9 am: 2d47ac0df7
Andreas Gampe [Mon, 21 May 2018 18:41:58 +0000 (11:41 -0700)]
Merge "ActivityManager: Fix slow-app ANR dumping" am: 923208e8c9 am: 2d47ac0df7
am: 1c015160c6

Change-Id: Id3bd33caa4137b36b7ead74689bf2c0aaa09e3d4

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: f28ef4...
Bill Yi [Mon, 21 May 2018 18:37:07 +0000 (11:37 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: f28ef47762  -s ours
am: 38f9bb955a  -s ours

Change-Id: I58084ac82e5999d5ff8443cc1fddbbea99a1cbee

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 374343...
Bill Yi [Mon, 21 May 2018 18:35:29 +0000 (11:35 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 3743438f5e  -s ours
am: 3047866348  -s ours

Change-Id: I807d5fc4dec148159c2dcd57292b7dc6661491bf

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 998221...
Bill Yi [Mon, 21 May 2018 18:32:56 +0000 (11:32 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 998221a361  -s ours
am: 7fb9123a74  -s ours

Change-Id: Ia18a28f533332b12ad01856a81041ff3071d53b6

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 21 May 2018 18:32:41 +0000 (11:32 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 346e04785d  -s ours

Change-Id: I6f15d6341bd4574d65dd9c0eb08fc80482386beb

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: addcc2...
Bill Yi [Mon, 21 May 2018 18:31:06 +0000 (11:31 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: addcc20dd4  -s ours
am: 06d509f642  -s ours

Change-Id: I0f94f3a65fd6215824d3743025d8902e995c096e

6 years agoMerge "ActivityManager: Fix slow-app ANR dumping" am: 923208e8c9
Andreas Gampe [Mon, 21 May 2018 18:25:06 +0000 (11:25 -0700)]
Merge "ActivityManager: Fix slow-app ANR dumping" am: 923208e8c9
am: 2d47ac0df7

Change-Id: Ie4274380bb66a35a6ba12d0f868ae78ef80f4b0d

6 years agoMerge "Keep scrim black when "always on" is off" into pi-dev
Lucas Dupin [Mon, 21 May 2018 18:23:59 +0000 (18:23 +0000)]
Merge "Keep scrim black when "always on" is off" into pi-dev

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 21 May 2018 18:18:24 +0000 (11:18 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: f28ef47762  -s ours

Change-Id: Ieed9e65080e7aba8701d23ef5b416fc4b896ea7f

6 years agoMerge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev am...
Bill Yi [Mon, 21 May 2018 18:18:03 +0000 (11:18 -0700)]
Merge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev am: 99e6aa1b1e am: d88c6877da am: aa55d5db76 am: b138eaa7b7
am: 370e6da71a

Change-Id: I992104d24ba9708f8ccb34a2871c2104acf6f9ec

6 years agoMerge "ActivityManager: Fix slow-app ANR dumping"
Andreas Gampe [Mon, 21 May 2018 18:17:24 +0000 (11:17 -0700)]
Merge "ActivityManager: Fix slow-app ANR dumping"
am: 923208e8c9

Change-Id: Ifed1ed567587b7616880f3b640d3162c57a40644

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 21 May 2018 18:17:01 +0000 (11:17 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 3743438f5e  -s ours

Change-Id: I92b0c74b35b8b5d6e98053202d8529e25fee3eaf

6 years agoMerge "Add a shell command for IMMS to test instant apps" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 18:15:43 +0000 (18:15 +0000)]
Merge "Add a shell command for IMMS to test instant apps" into pi-dev

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 21 May 2018 18:13:26 +0000 (11:13 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 998221a361  -s ours

Change-Id: I85f9d555bfdf76d0b0ebcfc25c351304c208b9ef

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Mon, 21 May 2018 18:11:36 +0000 (11:11 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: addcc20dd4  -s ours

Change-Id: Id0247616a981fcc59b0956bf0ba29f0e96d7980a

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped...
Bill Yi [Mon, 21 May 2018 18:10:57 +0000 (11:10 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped: ea0127f477 am: 4f1f428661  -s ours am: a53d91e485  -s ours am: 5e1f17a880  -s ours am: 91d2623fe0  -s ours
am: 654d5044ef  -s ours

Change-Id: I403ab21dbffb7d9b091d412a3504cedd1aca9f2f

6 years agoMerge "Add a field in config to disable/enable the string hashing in metric report...
TreeHugger Robot [Mon, 21 May 2018 18:05:00 +0000 (18:05 +0000)]
Merge "Add a field in config to disable/enable the string hashing in metric report." into pi-dev

6 years agoMerge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev am...
Bill Yi [Mon, 21 May 2018 18:04:38 +0000 (11:04 -0700)]
Merge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev am: 99e6aa1b1e am: d88c6877da am: aa55d5db76
am: b138eaa7b7

Change-Id: Idf0ba5b3480762902f3df610bd313653c2111550

6 years agoMerge "ResXMLTree: Clone DynamicRefTable on creation" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 17:59:35 +0000 (17:59 +0000)]
Merge "ResXMLTree: Clone DynamicRefTable on creation" into pi-dev

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped...
Bill Yi [Mon, 21 May 2018 17:57:38 +0000 (10:57 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped: ea0127f477 am: 4f1f428661  -s ours am: a53d91e485  -s ours am: 5e1f17a880  -s ours
am: 91d2623fe0  -s ours

Change-Id: I66d8b302db8bd7f2397cfeff65a73fa96f6c28fa

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 17:57:26 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 17:56:41 +0000 (17:56 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 17:54:35 +0000 (17:54 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 17:54:31 +0000 (17:54 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 17:53:32 +0000 (17:53 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 17:51:35 +0000 (17:51 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years ago[automerger skipped] Merge changes from topic "apf-read-ram" am: b5dda0e316 am: 0ec7b...
Bernie Innocenti [Mon, 21 May 2018 17:42:13 +0000 (10:42 -0700)]
[automerger skipped] Merge changes from topic "apf-read-ram" am: b5dda0e316 am: 0ec7b1e85e  -s ours
am: 7ef34d8629  -s ours

Change-Id: I2ce8a520f0bb744329bb7c9c2782bdbc1f8ace3f

6 years agoMerge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev am...
Bill Yi [Mon, 21 May 2018 17:41:15 +0000 (10:41 -0700)]
Merge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev am: 99e6aa1b1e am: d88c6877da
am: aa55d5db76

Change-Id: If6e65aa957489e085d1a96be0367e158c43ebc5b

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped...
Bill Yi [Mon, 21 May 2018 17:34:57 +0000 (10:34 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped: ea0127f477 am: 4f1f428661  -s ours am: a53d91e485  -s ours
am: 5e1f17a880  -s ours

Change-Id: I5fdb579286d6ddce6f6a20b2fab243b33840bf93

6 years ago[automerger skipped] Merge changes from topic "apf-read-ram" am: b5dda0e316
Bernie Innocenti [Mon, 21 May 2018 17:32:00 +0000 (10:32 -0700)]
[automerger skipped] Merge changes from topic "apf-read-ram" am: b5dda0e316
am: 0ec7b1e85e  -s ours

Change-Id: I8fac093bd2a55d6c59856374fa31d88207fc7623

6 years agoMerge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev am...
Bill Yi [Mon, 21 May 2018 17:28:44 +0000 (10:28 -0700)]
Merge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev am: 99e6aa1b1e
am: d88c6877da

Change-Id: I0acd60a59fcb928752ce7bf952bbfe9f65b68ff4

6 years agoMerge "WifiConfiguration: New temp disable network status for no internet" into pi...
Roshan Pius [Mon, 21 May 2018 17:26:51 +0000 (10:26 -0700)]
Merge "WifiConfiguration: New temp disable network status for no internet" into pi-dev am: 95509057f8
am: dee99a1b2b

Change-Id: I9274ba934a102a17d554133caed5ede6cce551b0

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped...
Bill Yi [Mon, 21 May 2018 17:24:41 +0000 (10:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped: ea0127f477 am: 4f1f428661  -s ours
am: a53d91e485  -s ours

Change-Id: Ife13f7c8262521ddc28deb4ceaf5b27b9765c792

6 years agoMerge "WifiConfiguration: New temp disable network status for no internet" into pi-dev
Roshan Pius [Mon, 21 May 2018 17:20:11 +0000 (10:20 -0700)]
Merge "WifiConfiguration: New temp disable network status for no internet" into pi-dev
am: 95509057f8

Change-Id: I73fc1ed24e79689315ed5d4501a412afce24f6e8

6 years agoMerge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev
Bill Yi [Mon, 21 May 2018 17:19:31 +0000 (10:19 -0700)]
Merge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev
am: 99e6aa1b1e

Change-Id: Id35ca83236112898b4e39b3cb173be70c435168f

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped...
Bill Yi [Mon, 21 May 2018 17:17:56 +0000 (10:17 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped: ea0127f477
am: 4f1f428661  -s ours

Change-Id: Iac8c22f36859d6648ae856236c9a97080238cae5

6 years agoKeep scrim black when "always on" is off
Lucas Dupin [Sat, 19 May 2018 00:24:52 +0000 (17:24 -0700)]
Keep scrim black when "always on" is off

The first frame when waking up is expensive and we
need a black scrim hiding what was left behind.

Bug: 78022321
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
Change-Id: I99e2b7960daf2cbe51bec6aee4b15c74d532078c

6 years agoMerge "WifiConfiguration: New temp disable network status for no internet" into pi-dev
Roshan Pius [Mon, 21 May 2018 17:04:10 +0000 (17:04 +0000)]
Merge "WifiConfiguration: New temp disable network status for no internet" into pi-dev

6 years agoMerge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev
TreeHugger Robot [Mon, 21 May 2018 17:03:49 +0000 (17:03 +0000)]
Merge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped: ea0127f477
  [automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb
  Import translations. DO NOT MERGE

6 years agoMerge "ActivityManager: Fix slow-app ANR dumping"
Treehugger Robot [Mon, 21 May 2018 16:59:17 +0000 (16:59 +0000)]
Merge "ActivityManager: Fix slow-app ANR dumping"

6 years agoAdd a shell command for IMMS to test instant apps
Yohei Yukawa [Mon, 21 May 2018 16:47:53 +0000 (09:47 -0700)]
Add a shell command for IMMS to test instant apps

This change adds a shell command to allow InputMethodManagerService
(IMMS) to bind to InputMethodService provided by instant apps, like we
did so for AccessibilityManagerService [1].  Note that binding to an
InputMethodService provided by instant apps is not a supported
scenario.  In theory we can avoid doing this by having a separate APK
for MockIme instead of putting everything into
CtsInputMethodTestCases.apk but that configuration is not yet
supported by our test harness hence it doesn't work right now hence
having this special mode for testing is the only way we have right
now.

 [1]: Ifced735a9a6e495747372dd8b00fdd64933a09c7
      d223db316d11a625a73f86392e7055d5c6f26e7d

Bug: 79484568
Test: Manually verified as follows:
  1. Build a test IME that has android:targetSandboxVersion="2" in its
     AndroidManifest.xml.
  2. Install the test IME APK with 'adb install --instant <APK>'
  3. adb shell ime list -a -s
  4. Make sure that the test IME is not in the list.
  5. adb shell cmd input_method set-bind-instant-service-allowed true
  6. adb shell ime list -a -s
  7. Make sure that the test IME is now in the list.
  8. Select that test IME.
  9. Make sure that the test IME is working.
 10. adb shell cmd input_method set-bind-instant-service-allowed false
 11. Make sure that the test IME is no longer the current IME.
 12. adb shell ime list -a -s
 13. Make sure that the test IME is no longer in the list.
Test: cts-tradefed run cts-instant -m CtsInputMethodTestCases
Change-Id: I4383129fd9e229a849282e874aff5d4eef1f49f8

6 years agoMerge changes from topic "apf-read-ram"
Bernie Innocenti [Mon, 21 May 2018 16:40:29 +0000 (09:40 -0700)]
Merge changes from topic "apf-read-ram"
am: b5dda0e316

Change-Id: I80d70e5bce6d1a0903599e98d2d251459df1292a

6 years agoMerge "BootParameters: Support silent boot."
Mickey Keeley [Mon, 21 May 2018 16:18:58 +0000 (16:18 +0000)]
Merge "BootParameters: Support silent boot."

6 years agoMerge changes from topic "apf-read-ram"
Treehugger Robot [Mon, 21 May 2018 15:33:28 +0000 (15:33 +0000)]
Merge changes from topic "apf-read-ram"

* changes:
  apf: Add counters for dropped / passed packets
  Add support for reading a snapshot of the APF data

6 years agoMerge "Status bar icons 15 dp" into pi-dev am: 97abc762cc
Evan Laird [Mon, 21 May 2018 15:14:03 +0000 (08:14 -0700)]
Merge "Status bar icons 15 dp" into pi-dev am: 97abc762cc
am: 4811db16a5

Change-Id: I75f145a1cd7445674964e0e7b1127290df3bad87

6 years agoMerge "Status bar icons 15 dp" into pi-dev
Evan Laird [Mon, 21 May 2018 15:06:29 +0000 (08:06 -0700)]
Merge "Status bar icons 15 dp" into pi-dev
am: 97abc762cc

Change-Id: I9d33e4b766952a29ef67fabc17a2ed47ba9114ef

6 years agoMerge "Status bar icons 15 dp" into pi-dev
TreeHugger Robot [Mon, 21 May 2018 14:55:11 +0000 (14:55 +0000)]
Merge "Status bar icons 15 dp" into pi-dev

6 years agoMerge "Allow user to change AiAi's permissions." into pi-dev am: 80f0481628
Ye Wen [Mon, 21 May 2018 14:47:14 +0000 (07:47 -0700)]
Merge "Allow user to change AiAi's permissions." into pi-dev am: 80f0481628
am: a97e688db3

Change-Id: I7b503e6d380330932a6b620fcf142926e358c835

6 years agoMerge "Allow user to change AiAi's permissions." into pi-dev
Ye Wen [Mon, 21 May 2018 14:33:07 +0000 (07:33 -0700)]
Merge "Allow user to change AiAi's permissions." into pi-dev
am: 80f0481628

Change-Id: I31410b69de5de58549e3c218888117abefc3924c

6 years agoMerge "Allow user to change AiAi's permissions." into pi-dev
Ye Wen [Mon, 21 May 2018 14:19:55 +0000 (14:19 +0000)]
Merge "Allow user to change AiAi's permissions." into pi-dev

6 years agoClean up Bitmap allocation size computation.
Ben Wagner [Fri, 18 May 2018 21:46:48 +0000 (17:46 -0400)]
Clean up Bitmap allocation size computation.

In addition to making this do what is intended in both debug and
release, this removes some of the last uses of sk_64_isS32 and
sk_64_asS32 so that they can be removed.

Test: refactoring CL. Existing unit tests still pass.
Change-Id: I4cd9fb124719f8e7e23db6bf268cbda64c29d283

6 years agoMerge "[SettingsLib] Update Utils.getColorAccent() and Utils.getColorError() to retur...
TreeHugger Robot [Mon, 21 May 2018 10:23:17 +0000 (10:23 +0000)]
Merge "[SettingsLib] Update Utils.getColorAccent() and Utils.getColorError() to return ColorStateLists instead of colors."

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 21 May 2018 00:01:33 +0000 (17:01 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I99ed00eac259f67c341c1a82a547221bb7082e1f

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 20 May 2018 22:13:14 +0000 (15:13 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id52e0cc164ebb1c62710dfc81b4bf70d231e08fb

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 20 May 2018 22:06:11 +0000 (15:06 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I11a29c0ab563be1a3a6bdf96fc82e719ce98e9c4

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 20 May 2018 20:11:33 +0000 (13:11 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I5e753540af680ab9f8514066a9b164cd51a149ce

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 20 May 2018 20:04:20 +0000 (13:04 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Icd1296a26d4c15ad5886b8cf1a7e0d438253b1cd

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 20 May 2018 19:49:57 +0000 (12:49 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ia968369bf14114aab85aa2aaa60050936585d5d6

6 years agoMerge "Avoid spamming native_set_position_mode by caching"
Yu-Han Yang [Sun, 20 May 2018 18:40:59 +0000 (18:40 +0000)]
Merge "Avoid spamming native_set_position_mode by caching"

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 167b45...
Bill Yi [Sun, 20 May 2018 14:30:14 +0000 (07:30 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 167b451daa  -s ours
am: 61f5ff3143  -s ours

Change-Id: I3765266bc79f4c4b1921d9574f0acf3c054c174a

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Sun, 20 May 2018 14:25:44 +0000 (07:25 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 167b451daa  -s ours

Change-Id: Iad888e5ac5537dc6f0f8ef7f6a083c45eb903014

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sun, 20 May 2018 14:20:13 +0000 (14:20 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 20 May 2018 07:45:08 +0000 (00:45 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id6f7b7b77a60fc3d42cd583a6d7e77f75b6b6bc4

6 years ago[automerger skipped] Add new metrics constant for Bluetooth A2DP hardware offload...
Petri Gynther [Sun, 20 May 2018 06:52:30 +0000 (23:52 -0700)]
[automerger skipped] Add new metrics constant for Bluetooth A2DP hardware offload am: 915e94484b
am: fdac63deb9  -s ours

Change-Id: I164f148709058c7f08d12cb10bf1d79bbcf0d6ac

6 years agoAdd new metrics constant for Bluetooth A2DP hardware offload
Petri Gynther [Sun, 20 May 2018 06:41:25 +0000 (23:41 -0700)]
Add new metrics constant for Bluetooth A2DP hardware offload
am: 915e94484b

Change-Id: I06598deff8e7bef50d216fc420f4eff9a98bb0cb

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sun, 20 May 2018 06:04:25 +0000 (06:04 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoAdd new metrics constant for Bluetooth A2DP hardware offload
Petri Gynther [Sat, 19 May 2018 05:59:50 +0000 (22:59 -0700)]
Add new metrics constant for Bluetooth A2DP hardware offload

Bug: 63932139
Bug: 79568680
Test: Settings app compiles without errors
Change-Id: I535f9cd819787f6c8d24facb5824dbf7472d5231
Merged-In: I535f9cd819787f6c8d24facb5824dbf7472d5231

6 years agoAdd new metrics constant for Bluetooth A2DP hardware offload
Petri Gynther [Sat, 19 May 2018 05:59:50 +0000 (22:59 -0700)]
Add new metrics constant for Bluetooth A2DP hardware offload

Bug: 63932139
Bug: 79568680
Test: Settings app compiles without errors
Change-Id: I535f9cd819787f6c8d24facb5824dbf7472d5231

6 years agoMerge "IMPORTANCE_FOREGROUND_SERVICE process can access fingerprint" into pi-dev...
Svet Ganov [Sun, 20 May 2018 05:08:41 +0000 (22:08 -0700)]
Merge "IMPORTANCE_FOREGROUND_SERVICE process can access fingerprint" into pi-dev am: d3c218a59e
am: 12fddb72bf

Change-Id: Ia89b8d008cbcc6cc59bbe2fa19d7f712ae5f5dfd

6 years agoMerge "IMPORTANCE_FOREGROUND_SERVICE process can access fingerprint" into pi-dev
Svet Ganov [Sun, 20 May 2018 05:01:17 +0000 (22:01 -0700)]
Merge "IMPORTANCE_FOREGROUND_SERVICE process can access fingerprint" into pi-dev
am: d3c218a59e

Change-Id: Ide279f85d9eb21c46148a4a5ff293f69d9172287

6 years agoMerge "IMPORTANCE_FOREGROUND_SERVICE process can access fingerprint" into pi-dev
TreeHugger Robot [Sun, 20 May 2018 04:53:24 +0000 (04:53 +0000)]
Merge "IMPORTANCE_FOREGROUND_SERVICE process can access fingerprint" into pi-dev

6 years agoMerge "Wrapping native methods under HdmiCecController for testing injection."
Amy Zhang [Sun, 20 May 2018 00:28:26 +0000 (00:28 +0000)]
Merge "Wrapping native methods under HdmiCecController for testing injection."

6 years agoMerge "Fade back button in and out tied with the overview/shelf (1/2)" into pi-dev...
Winson Chung [Sat, 19 May 2018 04:58:29 +0000 (21:58 -0700)]
Merge "Fade back button in and out tied with the overview/shelf (1/2)" into pi-dev am: d51bbc5fe4
am: b43ab66d3c

Change-Id: I02a0ea7f444db8cfe15e731c2050c17b8bc59e3c

6 years agoMerge "Fade back button in and out tied with the overview/shelf (1/2)" into pi-dev
Winson Chung [Sat, 19 May 2018 04:49:24 +0000 (21:49 -0700)]
Merge "Fade back button in and out tied with the overview/shelf (1/2)" into pi-dev
am: d51bbc5fe4

Change-Id: I42eb98160f653d6d2fd7f87b9657ea74fd9bc384

6 years agoMerge "Fade back button in and out tied with the overview/shelf (1/2)" into pi-dev
Winson Chung [Sat, 19 May 2018 04:36:16 +0000 (04:36 +0000)]
Merge "Fade back button in and out tied with the overview/shelf (1/2)" into pi-dev

6 years agoIMPORTANCE_FOREGROUND_SERVICE process can access fingerprint
Svet Ganov [Sat, 19 May 2018 02:59:25 +0000 (19:59 -0700)]
IMPORTANCE_FOREGROUND_SERVICE process can access fingerprint

We added a new priority IMPORTANCE_FOREGROUND_SERVICE
for foreground services and the services to  which the
system is bound fall into this bucket while before they
were falling into IMPORTANCE_FOREGROUND.

Test: manual

bug:79775649

Change-Id: I1626e78c5b7365985c5b4152637ab99aa0dea5f2

6 years agoMerge "Require READ_CALL_LOG permission to see phone numbers in phone state." am...
Tyler Gunn [Sat, 19 May 2018 02:04:11 +0000 (19:04 -0700)]
Merge "Require READ_CALL_LOG permission to see phone numbers in phone state." am: b1b864cee2 am: 6a8b23774e
am: 469a1f0dfa

Change-Id: I2f19a8e91cc612dc1de1496e48d48bed808aca2f

6 years agoMerge "Require READ_CALL_LOG permission to see phone numbers in phone state." am...
Tyler Gunn [Sat, 19 May 2018 01:50:20 +0000 (18:50 -0700)]
Merge "Require READ_CALL_LOG permission to see phone numbers in phone state." am: b1b864cee2
am: 6a8b23774e

Change-Id: Ia26cd1ed4693d67b9d54cf25e227bf349d0b04e3

6 years agoMerge "Update auto-rotate and print icons" into pi-dev am: bca78e76b3
Antony Sargent [Sat, 19 May 2018 01:47:51 +0000 (18:47 -0700)]
Merge "Update auto-rotate and print icons" into pi-dev am: bca78e76b3
am: 6d3558be94

Change-Id: Ia33931707741a9569ea1cefe0421db882c8173df

6 years agoMerge "Require READ_CALL_LOG permission to see phone numbers in phone state."
Tyler Gunn [Sat, 19 May 2018 01:36:54 +0000 (18:36 -0700)]
Merge "Require READ_CALL_LOG permission to see phone numbers in phone state."
am: b1b864cee2

Change-Id: I50a4fd925f22ffd1f255e8876e714b836948726d

6 years agoMerge "Update auto-rotate and print icons" into pi-dev
Antony Sargent [Sat, 19 May 2018 01:33:44 +0000 (18:33 -0700)]
Merge "Update auto-rotate and print icons" into pi-dev
am: bca78e76b3

Change-Id: I4b697311dc3d8ea32d7f969e385ca2e3e96588c1

6 years agoMerge "Update auto-rotate and print icons" into pi-dev
TreeHugger Robot [Sat, 19 May 2018 01:20:52 +0000 (01:20 +0000)]
Merge "Update auto-rotate and print icons" into pi-dev

6 years agoMerge "Hold wake lock while printing"
TreeHugger Robot [Sat, 19 May 2018 01:16:49 +0000 (01:16 +0000)]
Merge "Hold wake lock while printing"

6 years agoMerge "clone the visibility objects for the handler thread" into pi-dev am: 404273a627
Chris Wren [Sat, 19 May 2018 00:26:52 +0000 (17:26 -0700)]
Merge "clone the visibility objects for the handler thread" into pi-dev am: 404273a627
am: cd5fe1d4c4

Change-Id: Iaebcacbe8164e7495f3f64fdf72b263658d89e3b

6 years agoMerge "clone the visibility objects for the handler thread" into pi-dev
Chris Wren [Sat, 19 May 2018 00:18:32 +0000 (17:18 -0700)]
Merge "clone the visibility objects for the handler thread" into pi-dev
am: 404273a627

Change-Id: I7a6a74de3919cdfd2bd3ce03ecc59dc41448dbc5

6 years agoMerge "Reset wallpaper state during startup" into pi-dev am: 6b89784691
Lucas Dupin [Sat, 19 May 2018 00:14:50 +0000 (17:14 -0700)]
Merge "Reset wallpaper state during startup" into pi-dev am: 6b89784691
am: 1db0eafc6e

Change-Id: I8701d968649978269b7e1bd97a486ee49366e174

6 years agoMerge "Require READ_CALL_LOG permission to see phone numbers in phone state."
Tyler Gunn [Sat, 19 May 2018 00:13:15 +0000 (00:13 +0000)]
Merge "Require READ_CALL_LOG permission to see phone numbers in phone state."

6 years agoMerge "Set enabledSurroundFormats as empty string when it is null." into pi-dev am...
jiabin [Sat, 19 May 2018 00:08:32 +0000 (17:08 -0700)]
Merge "Set enabledSurroundFormats as empty string when it is null." into pi-dev am: 66726f3609
am: 065423e5b3

Change-Id: I03213d3838cf603eec81d008de0f1f09c9a23772