OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Fix height of keyguard status bar" into pi-dev am: 49748cd136
Evan Laird [Mon, 14 May 2018 14:19:36 +0000 (07:19 -0700)]
Merge "Fix height of keyguard status bar" into pi-dev am: 49748cd136
am: 3f8e49bf70

Change-Id: I2d5da86ec624ef0d21c6a955dcbbbf5ce2304ee9

6 years agoMerge "Fix height of keyguard status bar" into pi-dev
Evan Laird [Mon, 14 May 2018 13:56:10 +0000 (06:56 -0700)]
Merge "Fix height of keyguard status bar" into pi-dev
am: 49748cd136

Change-Id: Ib485e5af6eae7dfd3850eef57ed0d4ae38496996

6 years agoMerge "Fix height of keyguard status bar" into pi-dev
TreeHugger Robot [Mon, 14 May 2018 13:48:34 +0000 (13:48 +0000)]
Merge "Fix height of keyguard status bar" into pi-dev

6 years agoMerge "Bugreport greylist updates."
Nicolas Geoffray [Mon, 14 May 2018 13:48:02 +0000 (13:48 +0000)]
Merge "Bugreport greylist updates."

6 years agoMerge "Provide convenience to check max password length."
Pavel Grafov [Mon, 14 May 2018 12:33:33 +0000 (12:33 +0000)]
Merge "Provide convenience to check max password length."

6 years ago[automerger skipped] Merge "Include in hidden API dark greylist based on package...
David Brazdil [Mon, 14 May 2018 12:30:05 +0000 (05:30 -0700)]
[automerger skipped] Merge "Include in hidden API dark greylist based on package name" am: 248db48254 am: 09706e4ef5  -s ours
am: 2f075d17d2  -s ours

Change-Id: I53d108337268a9003594dcd62af6576ee0d83ef2

6 years ago[automerger skipped] Merge "Include in hidden API dark greylist based on package...
David Brazdil [Mon, 14 May 2018 12:21:48 +0000 (05:21 -0700)]
[automerger skipped] Merge "Include in hidden API dark greylist based on package name" am: 248db48254
am: 09706e4ef5  -s ours

Change-Id: I1a7eebfcff046118e1a2998d03428f4c7cde5c30

6 years agoMerge "Include in hidden API dark greylist based on package name"
David Brazdil [Mon, 14 May 2018 12:13:26 +0000 (05:13 -0700)]
Merge "Include in hidden API dark greylist based on package name"
am: 248db48254

Change-Id: If38ba9e9743fe4615d8da6f865f69927db4be3ce

6 years agoBugreport greylist updates.
Nicolas Geoffray [Mon, 14 May 2018 10:29:56 +0000 (11:29 +0100)]
Bugreport greylist updates.

Monday edition.
Manual as it looks the tables haven't been populated yet.

bug:79630776
bug:79577968
bug:79604623
Test: m
Change-Id: I569b827821ed5651afab409a66704ba61a572a7c

6 years agoMerge "Include in hidden API dark greylist based on package name"
David Brazdil [Mon, 14 May 2018 10:23:10 +0000 (10:23 +0000)]
Merge "Include in hidden API dark greylist based on package name"

6 years agoMerge "Remove custom schema parsing in favor of Uri" into pi-dev am: e3125c7e89
Jan Althaus [Mon, 14 May 2018 08:44:27 +0000 (01:44 -0700)]
Merge "Remove custom schema parsing in favor of Uri" into pi-dev am: e3125c7e89
am: 927c227845

Change-Id: Ic42e3a481e6ced6a74f795118e2d576f261790cc

6 years agoMerge "Remove custom schema parsing in favor of Uri" into pi-dev
Jan Althaus [Mon, 14 May 2018 08:31:22 +0000 (01:31 -0700)]
Merge "Remove custom schema parsing in favor of Uri" into pi-dev
am: e3125c7e89

Change-Id: Ia306e77a7047d6f8bdc923cfd1ad160e4c82863c

6 years agoMerge "Remove custom schema parsing in favor of Uri" into pi-dev
Jan Althaus [Mon, 14 May 2018 08:21:40 +0000 (08:21 +0000)]
Merge "Remove custom schema parsing in favor of Uri" into pi-dev

6 years agoMerge "Do not parcel legacy TextClassification fields" into pi-dev am: 6db14d01c2
Abodunrinwa Toki [Sun, 13 May 2018 21:52:24 +0000 (14:52 -0700)]
Merge "Do not parcel legacy TextClassification fields" into pi-dev am: 6db14d01c2
am: 164183125c

Change-Id: I2a7b4323e815f5a4868085be69e417439729ff90

6 years agoMerge "Do not parcel legacy TextClassification fields" into pi-dev
Abodunrinwa Toki [Sun, 13 May 2018 21:44:11 +0000 (14:44 -0700)]
Merge "Do not parcel legacy TextClassification fields" into pi-dev
am: 6db14d01c2

Change-Id: I8e26ed6f5dceaea509ea8d43c2088018ba4aac8e

6 years agoMerge "Do not parcel legacy TextClassification fields" into pi-dev
TreeHugger Robot [Sun, 13 May 2018 21:32:20 +0000 (21:32 +0000)]
Merge "Do not parcel legacy TextClassification fields" into pi-dev

6 years agoMerge "Make HDMI_CEC a vendorPriviliged permission"
TreeHugger Robot [Sun, 13 May 2018 16:50:48 +0000 (16:50 +0000)]
Merge "Make HDMI_CEC a vendorPriviliged permission"

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: d19cc3...
Bill Yi [Sun, 13 May 2018 05:10:44 +0000 (22:10 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: d19cc3d7ea  -s ours
am: ee4c4f65a8  -s ours

Change-Id: I3c61b269accd22829d7bdb9c1cf71e983a4e4d98

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Sun, 13 May 2018 05:02:36 +0000 (22:02 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: d19cc3d7ea  -s ours

Change-Id: Ie38b12288a41442b296a313ad323e565d17b02cd

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

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 12 May 2018 17:29:46 +0000 (10:29 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I8b4031e16a8aaf7ae199721f134c90a023a5e563

6 years agoMerge "Guardrail the max gauge atoms per dimension in one bucket." into pi-dev am...
Yangster-mac [Sat, 12 May 2018 03:23:49 +0000 (20:23 -0700)]
Merge "Guardrail the max gauge atoms per dimension in one bucket." into pi-dev am: 67cee97754
am: 2d41c7d382

Change-Id: I59c218fe5048f2d9e828f6f4f621b031cd424acd

6 years agoMerge "Guardrail the max gauge atoms per dimension in one bucket." into pi-dev
Yangster-mac [Sat, 12 May 2018 03:15:13 +0000 (20:15 -0700)]
Merge "Guardrail the max gauge atoms per dimension in one bucket." into pi-dev
am: 67cee97754

Change-Id: I74ad62e53fc245f8c77741db3235543846f70832

6 years agoMerge "Guardrail the max gauge atoms per dimension in one bucket." into pi-dev
TreeHugger Robot [Sat, 12 May 2018 03:03:01 +0000 (03:03 +0000)]
Merge "Guardrail the max gauge atoms per dimension in one bucket." into pi-dev

6 years agoMerge "Fixes statsd reports missing strings and SCS." into pi-dev am: 50a5e71bf3
David Chen [Sat, 12 May 2018 03:01:47 +0000 (20:01 -0700)]
Merge "Fixes statsd reports missing strings and SCS." into pi-dev am: 50a5e71bf3
am: efe26104b3

Change-Id: Ied3e488c357ce30206aa80179a8d204204ff07a4

6 years agoMerge "Fixes statsd reports missing strings and SCS." into pi-dev
David Chen [Sat, 12 May 2018 02:52:59 +0000 (19:52 -0700)]
Merge "Fixes statsd reports missing strings and SCS." into pi-dev
am: 50a5e71bf3

Change-Id: Icc690ce0a82d07ad46fb95e1a369a037cc9ff9e3

6 years agoMerge "Fixes statsd reports missing strings and SCS." into pi-dev
TreeHugger Robot [Sat, 12 May 2018 02:42:40 +0000 (02:42 +0000)]
Merge "Fixes statsd reports missing strings and SCS." into pi-dev

6 years agoMerge "autofill save: do not focus on custom sub title for TV" into pi-dev am: ba96b97aab
Dake Gu [Sat, 12 May 2018 02:11:01 +0000 (19:11 -0700)]
Merge "autofill save: do not focus on custom sub title for TV" into pi-dev am: ba96b97aab
am: 559003e1c8

Change-Id: Idc0853955bc89032bc9a5702bf6e67bdb47164f5

6 years agoMerge "autofill save: do not focus on custom sub title for TV" into pi-dev
Dake Gu [Sat, 12 May 2018 02:02:17 +0000 (19:02 -0700)]
Merge "autofill save: do not focus on custom sub title for TV" into pi-dev
am: ba96b97aab

Change-Id: Ia2726c6f4513c6a17e9eaa1b75af67405e71aa49

6 years agoMerge "autofill save: do not focus on custom sub title for TV" into pi-dev
Dake Gu [Sat, 12 May 2018 01:50:03 +0000 (01:50 +0000)]
Merge "autofill save: do not focus on custom sub title for TV" into pi-dev

6 years agoMerge "BluetoothManager: Continue when BLE not supported" am: 7e8c166d8e am: d13349ff6c
Myles Watson [Sat, 12 May 2018 01:31:31 +0000 (18:31 -0700)]
Merge "BluetoothManager: Continue when BLE not supported" am: 7e8c166d8e am: d13349ff6c
am: edfd2dbc9c

Change-Id: I84b6470dbbb86e5b5301b24f0d5b997902723457

6 years agoMerge "BluetoothManager: Continue when BLE not supported" am: 7e8c166d8e
Myles Watson [Sat, 12 May 2018 01:17:59 +0000 (18:17 -0700)]
Merge "BluetoothManager: Continue when BLE not supported" am: 7e8c166d8e
am: d13349ff6c

Change-Id: I7949b8a2f013229cdca726758f01ac45952c40ea

6 years agoMerge "Fixes splitscreen when executed from fullscreen app" into pi-dev am: 765801d5fb
Matthew Ng [Sat, 12 May 2018 01:11:44 +0000 (18:11 -0700)]
Merge "Fixes splitscreen when executed from fullscreen app" into pi-dev am: 765801d5fb
am: 88f945d557

Change-Id: I872d59b62f33f5c14dcba2164e5b9a4f17a2c2f6

6 years agoMerge "BluetoothManager: Continue when BLE not supported"
Myles Watson [Sat, 12 May 2018 01:09:10 +0000 (18:09 -0700)]
Merge "BluetoothManager: Continue when BLE not supported"
am: 7e8c166d8e

Change-Id: I6bacffc9d9ed18e44b2c7c70a62d6c40a2835c30

6 years agoMerge "Prevent IME from targeting home when closing app is still animating" into...
chaviw [Sat, 12 May 2018 01:07:45 +0000 (18:07 -0700)]
Merge "Prevent IME from targeting home when closing app is still animating" into pi-dev am: 3a4fb1c90a
am: a678c36f28

Change-Id: If4690093332a01ebc112e0c3eb75661a9f554d4e

6 years agoFilter instant app resolution based on logical UID am: cbcbf66f6a
Svet Ganov [Sat, 12 May 2018 01:03:54 +0000 (18:03 -0700)]
Filter instant app resolution based on logical UID am: cbcbf66f6a
am: 1f4e21be3a

Change-Id: I1a8550fb8c6850a6f6392f3881ce33fd2ff9af0c

6 years agoMerge "Fixes splitscreen when executed from fullscreen app" into pi-dev
Matthew Ng [Sat, 12 May 2018 00:43:44 +0000 (17:43 -0700)]
Merge "Fixes splitscreen when executed from fullscreen app" into pi-dev
am: 765801d5fb

Change-Id: I43d03c1e5423b0a6117f91b10e8c179a459c221c

6 years agoMerge "Prevent IME from targeting home when closing app is still animating" into...
chaviw [Sat, 12 May 2018 00:38:11 +0000 (17:38 -0700)]
Merge "Prevent IME from targeting home when closing app is still animating" into pi-dev
am: 3a4fb1c90a

Change-Id: Ide62a9b482e56dcfe53bd9d03cd121053ce01528

6 years agoMerge "Wait for the user to fully stop before starting" into pi-dev am: afb6f3b046
Fyodor Kupolov [Sat, 12 May 2018 00:28:09 +0000 (17:28 -0700)]
Merge "Wait for the user to fully stop before starting" into pi-dev am: afb6f3b046
am: 6fb7d3c8e3

Change-Id: I79d90efe4614d829ab85a688a94456c7fe268ff7

6 years agoMerge "Fixes splitscreen when executed from fullscreen app" into pi-dev
Matthew Ng [Sat, 12 May 2018 00:27:28 +0000 (00:27 +0000)]
Merge "Fixes splitscreen when executed from fullscreen app" into pi-dev

6 years agoMerge "Prevent IME from targeting home when closing app is still animating" into...
TreeHugger Robot [Sat, 12 May 2018 00:25:43 +0000 (00:25 +0000)]
Merge "Prevent IME from targeting home when closing app is still animating" into pi-dev

6 years agoFilter instant app resolution based on logical UID
Svet Ganov [Sat, 12 May 2018 00:22:59 +0000 (17:22 -0700)]
Filter instant app resolution based on logical UID
am: cbcbf66f6a

Change-Id: I1859ff795d6886c88b30a0cfd06eaabd498ae2dc

6 years agoGuardrail the max gauge atoms per dimension in one bucket.
Yangster-mac [Fri, 11 May 2018 00:13:12 +0000 (17:13 -0700)]
Guardrail the max gauge atoms per dimension in one bucket.

Test: statsd
BUG: b/78603347
Change-Id: Ide77cc8ff0cde6cf6cc9e56034727ed27dd7be88

6 years agoMerge "Wait for the user to fully stop before starting" into pi-dev
Fyodor Kupolov [Sat, 12 May 2018 00:14:24 +0000 (17:14 -0700)]
Merge "Wait for the user to fully stop before starting" into pi-dev
am: afb6f3b046

Change-Id: I543c64a5c626a73edf730ddd19b678ff72e78cfc

6 years agoFilter instant app resolution based on logical UID
Svet Ganov [Fri, 11 May 2018 00:25:29 +0000 (17:25 -0700)]
Filter instant app resolution based on logical UID

Test: cts-tradefed run cts-dev -m CtsAppSecurityHostTestCases
          -t android.appsecurity.cts.EphemeralTest
      cts-tradefed run cts-dev -m CtsActivityManagerDeviceTestCases

bug: 79487366

Change-Id: I51157410d944bc3252de29b4143bb2c7fe7fcefe

6 years agoMerge "BluetoothManager: Continue when BLE not supported" into pi-dev am: 027dd5382d
Myles Watson [Sat, 12 May 2018 00:05:43 +0000 (17:05 -0700)]
Merge "BluetoothManager: Continue when BLE not supported" into pi-dev am: 027dd5382d
am: d44011f6e3

Change-Id: Ibb14ad1f345e0c35c9da742f6aa7366331e707c4

6 years agoFixes statsd reports missing strings and SCS.
David Chen [Fri, 11 May 2018 23:00:22 +0000 (16:00 -0700)]
Fixes statsd reports missing strings and SCS.

Reports written to disk don't contain the strings used, which will
make this report unusable if there are strings that don't show up
again. We should always include the strings, so this option is
removed entirely.

Also, we hard-coded the wrong number of fields when pulling
ModemActivityInfo. There are actually 10 fields, not 6.

Bug: 79601503
Test: Tested unit-tests pass on marlin-eng.
Change-Id: I6834b096ced77418a9cc2ddd79b08d1c9c447fae

6 years agoautofill save: do not focus on custom sub title for TV
Dake Gu [Fri, 11 May 2018 23:46:30 +0000 (16:46 -0700)]
autofill save: do not focus on custom sub title for TV

Custom sub title is put in a ScrollView, which steals the
initial focus from Yes/No button when lauching save dialog.

The ScrollView is focusable so it can scroll large views.
But it's quite useless at this point because layout use
"wrap_content" in height, unless the custom subtitle is
higher than fullscreen, we never uses the ScrollView's scroll
feature.

The problem for using ScrollView is:
- TV UX does not allow custom sub title to be focusable or
  scrollable.
- If changes TV UX to allow scrollable custom title view,
  focus indicator of ScrollView is missing, needs to be fixed.

Based on these reasons, disable scrollable feature for TV.

Bug: 79591730
Test: manually tested on AndroidTV
Change-Id: Ib6022daf822b8b977e9a2d4a831a8ba714fb321c

6 years agoMerge "Make right nav button container unselectable" into pi-dev am: 26111fc899
Mike Digman [Fri, 11 May 2018 23:59:06 +0000 (16:59 -0700)]
Merge "Make right nav button container unselectable" into pi-dev am: 26111fc899
am: 42a54a4091

Change-Id: Ib9df28f4ffffe11ecaccc38de7b541b6d4460460

6 years agoMerge "Wait for the user to fully stop before starting" into pi-dev
Fyodor Kupolov [Fri, 11 May 2018 23:57:14 +0000 (23:57 +0000)]
Merge "Wait for the user to fully stop before starting" into pi-dev

6 years agoMerge changes from topic "sysui_flags_drop" into pi-dev am: 53ae6a82cd
Winson Chung [Fri, 11 May 2018 23:48:13 +0000 (16:48 -0700)]
Merge changes from topic "sysui_flags_drop" into pi-dev am: 53ae6a82cd
am: 59ff523949

Change-Id: I8d6fa49ba23b78648cf43fafe7c290f2e0c4b59f

6 years agoMerge "BluetoothManager: Continue when BLE not supported" into pi-dev
Myles Watson [Fri, 11 May 2018 23:44:48 +0000 (16:44 -0700)]
Merge "BluetoothManager: Continue when BLE not supported" into pi-dev
am: 027dd5382d

Change-Id: Iaace238ceafa422e0757c57938c9daeee55c5207

6 years agoMerge "Pass Uri in SliceBroadcastRelay" into pi-dev am: cb20eb3a07
Matthew Fritze [Fri, 11 May 2018 23:40:56 +0000 (16:40 -0700)]
Merge "Pass Uri in SliceBroadcastRelay" into pi-dev am: cb20eb3a07
am: 3aa0ea25da

Change-Id: Ic4d9fed0e135e2ba55283162417642e5618d4a6a

6 years agoMerge "GM2 icon updates" into pi-dev am: 733a4b9948
Evan Laird [Fri, 11 May 2018 23:32:22 +0000 (16:32 -0700)]
Merge "GM2 icon updates" into pi-dev am: 733a4b9948
am: 5331f1982e

Change-Id: I2a5caaf344caefd78e28decead9e54a06d1d6111

6 years agoMerge "BluetoothManager: Continue when BLE not supported" into pi-dev
TreeHugger Robot [Fri, 11 May 2018 23:30:34 +0000 (23:30 +0000)]
Merge "BluetoothManager: Continue when BLE not supported" into pi-dev

6 years agoMerge "Show settings suggestion" into pi-dev am: 1b69d7b406
Beverly Tai [Fri, 11 May 2018 23:19:33 +0000 (16:19 -0700)]
Merge "Show settings suggestion" into pi-dev am: 1b69d7b406
am: 647907274f

Change-Id: I09a30f210a7ddd2a602d600e7b91c58a26592039

6 years agoMerge "BluetoothManager: Continue when BLE not supported"
Treehugger Robot [Fri, 11 May 2018 23:13:23 +0000 (23:13 +0000)]
Merge "BluetoothManager: Continue when BLE not supported"

6 years agoMerge "[Notif] Fix a11y when guts is open" into pi-dev am: 888b62d47a
Rohan Shah [Fri, 11 May 2018 23:11:38 +0000 (16:11 -0700)]
Merge "[Notif] Fix a11y when guts is open" into pi-dev am: 888b62d47a
am: 0db01a6496

Change-Id: Iebd5d47cf5a777f529224c3e5755f963f64fa26f

6 years agoMerge "Make right nav button container unselectable" into pi-dev
Mike Digman [Fri, 11 May 2018 23:04:14 +0000 (16:04 -0700)]
Merge "Make right nav button container unselectable" into pi-dev
am: 26111fc899

Change-Id: Iade2fd1a53f6360b6ae4a645d3dd4970169610fc

6 years agoMerge "Rename settings category." into pi-dev am: 24044a78bd
Doris Ling [Fri, 11 May 2018 23:01:13 +0000 (16:01 -0700)]
Merge "Rename settings category." into pi-dev am: 24044a78bd
am: ba5b6dd1ed

Change-Id: Icc2ba94b64fbf09c4618a91a880ea8da91e49d06

6 years agoMerge changes from topic "sysui_flags_drop" into pi-dev
Winson Chung [Fri, 11 May 2018 22:59:45 +0000 (15:59 -0700)]
Merge changes from topic "sysui_flags_drop" into pi-dev
am: 53ae6a82cd

Change-Id: I88661e52aedee934e5b5cdbfd1d457d2c6a7d1c1

6 years agoMerge "Add annotation for CHANGE_COMPONENT_ENABLED_STATE permission"
TreeHugger Robot [Fri, 11 May 2018 22:40:43 +0000 (22:40 +0000)]
Merge "Add annotation for CHANGE_COMPONENT_ENABLED_STATE permission"

6 years agoMerge "Fix issue #79541100: [Blueline][PI][SPT]: Watchdog killing process and SIGSEGV...
Makoto Onuki [Fri, 11 May 2018 22:34:26 +0000 (15:34 -0700)]
Merge "Fix issue #79541100: [Blueline][PI][SPT]: Watchdog killing process and SIGSEGV" into pi-dev am: 2b17e01643
am: b3950b7ccd

Change-Id: I347301fbb7eea52484488310d506d5ca717547ed

6 years agoMerge "Make right nav button container unselectable" into pi-dev
Mike Digman [Fri, 11 May 2018 22:24:21 +0000 (22:24 +0000)]
Merge "Make right nav button container unselectable" into pi-dev

6 years agoMerge "Add Bluetooth callback for device connection state changed" into pi-dev am...
Ryan Lin [Fri, 11 May 2018 22:24:07 +0000 (15:24 -0700)]
Merge "Add Bluetooth callback for device connection state changed" into pi-dev am: 15aa546a37
am: 70d7f682c1

Change-Id: Ida27c24a361bccd6ebb98b633f78ab78fc3e4c73

6 years agoMerge "Pass Uri in SliceBroadcastRelay" into pi-dev
Matthew Fritze [Fri, 11 May 2018 22:22:49 +0000 (15:22 -0700)]
Merge "Pass Uri in SliceBroadcastRelay" into pi-dev
am: cb20eb3a07

Change-Id: I4e4b345fdf060d631a9d7e18fad1c28adcad3378

6 years agoPrevent IME from targeting home when closing app is still animating
chaviw [Fri, 11 May 2018 16:32:22 +0000 (09:32 -0700)]
Prevent IME from targeting home when closing app is still animating

There were a few issues that caused the IME target to get set to home.
1. Home is considered above the other apps since it's getting launched.
However, the visual representation is actually below the closing app.
IME tries to target the highest app, but it's not necessarily the
highest visual app
2. computeIme was called before all apps were set up. This caused the
IME target to get recomputed before adding the closing apps
3. The condition for a WS.isClosing was based on previous versions so
it was incorrect

Test: IME closes on top of current target when going home with IME open
Change-Id: Id3bee8b8b6c0fba98159b65784b4b8c5b66c27fb
Fixes: 78214125

6 years agoMerge changes from topic "sysui_flags_drop" into pi-dev
Winson Chung [Fri, 11 May 2018 22:18:37 +0000 (22:18 +0000)]
Merge changes from topic "sysui_flags_drop" into pi-dev

* changes:
  Clean up Recents animation api
  Expose the system ui visibility flags and translucent state with snapshot

6 years agoMerge "Fix first-time slice permission grants" into pi-dev am: 9959b36635
Jason Monk [Fri, 11 May 2018 22:14:21 +0000 (15:14 -0700)]
Merge "Fix first-time slice permission grants" into pi-dev am: 9959b36635
am: c71f4fea4b

Change-Id: I3901736c83f7f49a4785b5755eb88e2e1345e82f

6 years agoMerge "Pass Uri in SliceBroadcastRelay" into pi-dev
TreeHugger Robot [Fri, 11 May 2018 22:05:36 +0000 (22:05 +0000)]
Merge "Pass Uri in SliceBroadcastRelay" into pi-dev

6 years agoBluetoothManager: Continue when BLE not supported
Myles Watson [Fri, 11 May 2018 15:47:24 +0000 (08:47 -0700)]
BluetoothManager: Continue when BLE not supported

Bluetooth should turn on completely (without GATT) when the chip
does not support Bluetooth Low Energy.

Bug: 77495521
Test: Remove vendor/etc/permissions/android.hardware.bluetooth_le.xml
      Reboot
      Toggle Bluetooth
Change-Id: I9314ee473b4a5a158196bab3037b1452247ba466

6 years agoBluetoothManager: Continue when BLE not supported
Myles Watson [Fri, 11 May 2018 15:47:24 +0000 (08:47 -0700)]
BluetoothManager: Continue when BLE not supported

Bluetooth should turn on completely (without GATT) when the chip
does not support Bluetooth Low Energy.

Bug: 77495521
Test: Remove vendor/etc/permissions/android.hardware.bluetooth_le.xml
      Reboot
      Toggle Bluetooth
Change-Id: I9314ee473b4a5a158196bab3037b1452247ba466
(cherry picked from commit 5123ebd75647d3e67487de69cd0381f325a0adc9)

6 years agoMerge "GM2 icon updates" into pi-dev
Evan Laird [Fri, 11 May 2018 21:50:07 +0000 (14:50 -0700)]
Merge "GM2 icon updates" into pi-dev
am: 733a4b9948

Change-Id: I4d18584f82a418d9b8f7288f509d53ac341d777d

6 years agoMerge "Detach children in transaction." into pi-dev am: 26aff0d907
Robert Carr [Fri, 11 May 2018 21:44:12 +0000 (14:44 -0700)]
Merge "Detach children in transaction." into pi-dev am: 26aff0d907
am: 3c65c76d56

Change-Id: If0238f6f002cf42b715237447b1b9eb797566909

6 years agoMerge "GM2 icon updates" into pi-dev
TreeHugger Robot [Fri, 11 May 2018 21:38:21 +0000 (21:38 +0000)]
Merge "GM2 icon updates" into pi-dev

6 years agoFix height of keyguard status bar
Evan Laird [Fri, 11 May 2018 21:16:17 +0000 (17:16 -0400)]
Fix height of keyguard status bar

The keyguard status bar was getting set to the height of the regular
status bar, and aligning itself with the top of the screen, causing
alignment issues

Test: visual
Change-Id: I5d75f89585010dc73bdedb133246412704706c64
Fixes: 77563515

6 years agoMerge "Add charging metrics" into pi-dev am: cf4f650572
Beverly [Fri, 11 May 2018 21:10:34 +0000 (14:10 -0700)]
Merge "Add charging metrics" into pi-dev am: cf4f650572
am: 976f6ade83

Change-Id: I31d5c785f45fe72443dcdd24c8714dd6f69ada8c

6 years agoMerge "Show settings suggestion" into pi-dev
Beverly Tai [Fri, 11 May 2018 21:09:30 +0000 (14:09 -0700)]
Merge "Show settings suggestion" into pi-dev
am: 1b69d7b406

Change-Id: I844f26a32f1c72ed605946d690154fa1f3141a0a

6 years agoMerge "[Notif] Fix a11y when guts is open" into pi-dev
Rohan Shah [Fri, 11 May 2018 21:04:24 +0000 (14:04 -0700)]
Merge "[Notif] Fix a11y when guts is open" into pi-dev
am: 888b62d47a

Change-Id: I1921ef4217f77e771d9d1aac88cfd6a4100b2b9f

6 years agoMerge "Show settings suggestion" into pi-dev
Beverly Tai [Fri, 11 May 2018 20:59:49 +0000 (20:59 +0000)]
Merge "Show settings suggestion" into pi-dev

6 years agoMerge "Add limits to App Usage Observer Api" into pi-dev am: 98fd4fa0f4
Amith Yamasani [Fri, 11 May 2018 20:58:41 +0000 (13:58 -0700)]
Merge "Add limits to App Usage Observer Api" into pi-dev am: 98fd4fa0f4
am: 36424476bb

Change-Id: I42d3db50e61f06431c8071b42088bd00762239f6

6 years agoMerge "Rename settings category." into pi-dev
Doris Ling [Fri, 11 May 2018 20:56:16 +0000 (13:56 -0700)]
Merge "Rename settings category." into pi-dev
am: 24044a78bd

Change-Id: I257ed814d67116c6a476a207ad7dbd8089533bda

6 years agoMerge "[Notif] Fix a11y when guts is open" into pi-dev
TreeHugger Robot [Fri, 11 May 2018 20:54:34 +0000 (20:54 +0000)]
Merge "[Notif] Fix a11y when guts is open" into pi-dev

6 years agoMerge "Moving native MIDI JNI init to AndroidRuntime.cpp."
Paul Mclean [Fri, 11 May 2018 20:52:44 +0000 (20:52 +0000)]
Merge "Moving native MIDI JNI init to AndroidRuntime.cpp."

6 years ago[automerger skipped] Merge "add install action for carrier id to system API" am:...
fionaxu [Fri, 11 May 2018 20:49:39 +0000 (13:49 -0700)]
[automerger skipped] Merge "add install action for carrier id to system API" am: 87a7c657bd am: 2bbb36cb4f  -s ours
am: 50b2c1ae6e  -s ours

Change-Id: Ia361c2ece6e47918697e4b3d54225ae62f4cba30

6 years agoMerge "Rename settings category." into pi-dev
TreeHugger Robot [Fri, 11 May 2018 20:49:35 +0000 (20:49 +0000)]
Merge "Rename settings category." into pi-dev

6 years agoAdd annotation for CHANGE_COMPONENT_ENABLED_STATE permission
Chad Brubaker [Fri, 11 May 2018 20:40:51 +0000 (13:40 -0700)]
Add annotation for CHANGE_COMPONENT_ENABLED_STATE permission

Test: builds
Bug: 79583362
Change-Id: Id7259d22b24ffdd0506ede28cce7307bdc44bd9b

6 years agoMerge "Fix TextClassifier logging." into pi-dev am: 1c60953f9d
Abodunrinwa Toki [Fri, 11 May 2018 20:40:26 +0000 (13:40 -0700)]
Merge "Fix TextClassifier logging." into pi-dev am: 1c60953f9d
am: c2aa28895a

Change-Id: Ia7efff7e3505053b21e4e7c6f55cc2394024f318

6 years agoFixes splitscreen when executed from fullscreen app
Matthew Ng [Fri, 13 Apr 2018 18:36:34 +0000 (11:36 -0700)]
Fixes splitscreen when executed from fullscreen app

Fixes splitscreen from the right for launching splitscreen from
fullscreen app including pixel launcher and 3rd party launchers. With
3rd party launchers, the experience is the same as Android O. With pixel
launcher since launcher and recents are merged, it will split to
minimized mode. When pixel launcher is used, the recents stack is
ignored.

Fixes: 73250406
Fixes: 78247419
Test: use split screen; invoke command with supportapp.apk in b/78247419
adb shell am broadcast -a launcher-acc --ei cmd 1
Change-Id: I70b0551c517465b3a059ff7d0641c27f71e8114e

6 years agoMerge "Fix issue #79541100: [Blueline][PI][SPT]: Watchdog killing process and SIGSEGV...
Makoto Onuki [Fri, 11 May 2018 20:26:58 +0000 (13:26 -0700)]
Merge "Fix issue #79541100: [Blueline][PI][SPT]: Watchdog killing process and SIGSEGV" into pi-dev
am: 2b17e01643

Change-Id: I0aa525f6a5c8b317dc2ce20ba8dbf7f087dbee8b

6 years agoMerge "Add Bluetooth callback for device connection state changed" into pi-dev
Ryan Lin [Fri, 11 May 2018 20:20:33 +0000 (13:20 -0700)]
Merge "Add Bluetooth callback for device connection state changed" into pi-dev
am: 15aa546a37

Change-Id: I110340139c1455dfe43ce4e5688ef40ee6118698

6 years agoMerge "Fix issue #79541100: [Blueline][PI][SPT]: Watchdog killing process and SIGSEGV...
Makoto Onuki [Fri, 11 May 2018 20:08:16 +0000 (20:08 +0000)]
Merge "Fix issue #79541100: [Blueline][PI][SPT]: Watchdog killing process and SIGSEGV" into pi-dev

6 years agoMerge "Fix first-time slice permission grants" into pi-dev
Jason Monk [Fri, 11 May 2018 19:56:43 +0000 (12:56 -0700)]
Merge "Fix first-time slice permission grants" into pi-dev
am: 9959b36635

Change-Id: Iaaccd67b47470ba19b13631e39dc2d6c3b335cb8

6 years agoMerge "IWYU for SkUnPreMultiply"
TreeHugger Robot [Fri, 11 May 2018 19:56:27 +0000 (19:56 +0000)]
Merge "IWYU for SkUnPreMultiply"

6 years agoMake right nav button container unselectable
Mike Digman [Fri, 11 May 2018 19:27:32 +0000 (12:27 -0700)]
Make right nav button container unselectable

Container can be selected via Talkback with no visible children.
Ensure container will never be selected.

Change-Id: I09d2f0a587fe4ecc71f73bb7f8be098abfbb11d5
Fixes: 79488376
Test: manual: empty and visible a11y, rotate, IME button

6 years agoMerge "Add Bluetooth callback for device connection state changed" into pi-dev
Ryan Lin [Fri, 11 May 2018 19:53:19 +0000 (19:53 +0000)]
Merge "Add Bluetooth callback for device connection state changed" into pi-dev

6 years agoMerge "Detach children in transaction." into pi-dev
Robert Carr [Fri, 11 May 2018 19:51:24 +0000 (12:51 -0700)]
Merge "Detach children in transaction." into pi-dev
am: 26aff0d907

Change-Id: If080b08b6e0f159423f5328c2b4df1c4008741f0

6 years agoMerge "Fall back to checking packages if one is not provided" into pi-dev am: 9d976db861
Chad Brubaker [Fri, 11 May 2018 19:42:44 +0000 (12:42 -0700)]
Merge "Fall back to checking packages if one is not provided" into pi-dev am: 9d976db861
am: 5f51d45334

Change-Id: I02502c178e41e23c1d11bc59df8e6bba6242ed4d

6 years agoMerge "Fix first-time slice permission grants" into pi-dev
Jason Monk [Fri, 11 May 2018 19:40:10 +0000 (19:40 +0000)]
Merge "Fix first-time slice permission grants" into pi-dev

6 years agoMerge "Detach children in transaction." into pi-dev
TreeHugger Robot [Fri, 11 May 2018 19:37:00 +0000 (19:37 +0000)]
Merge "Detach children in transaction." into pi-dev