OSDN Git Service

android-x86/frameworks-base.git
6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 9b8bceedc2 skipped...
Bill Yi [Mon, 16 Apr 2018 20:21:23 +0000 (13:21 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 9b8bceedc2 skipped: 1789ac6b28 am: d12aff917a  -s ours am: 06e9f9dad5  -s ours
am: 06ce4b2618  -s ours

Change-Id: I21bade1db7ee51f5ccbdd4afd08f3399c2e886e7

6 years agoMerge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev am: 6173fbe12e...
Philip P. Moltmann [Mon, 16 Apr 2018 20:19:04 +0000 (13:19 -0700)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev am: 6173fbe12e am: 6a845fe056
am: 1d9e95553b

Change-Id: Icb9e0c7261da6147d7d70be9f243fb387799c58f

6 years ago[automerger skipped] [automerger] DO NOT MERGE (M) Revoke permision when group change...
Philip P. Moltmann [Mon, 16 Apr 2018 19:50:03 +0000 (12:50 -0700)]
[automerger skipped] [automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53 am: 5630564178 am: 90cb8f7b6e skipped: 275e6bf1b4 am: 1bbc69d8f5 am: 8dbf706e9f am: 874fe98a8f am: 9b71a72cb0 skipped: f1776f0805 am: 877a845005 am: 885bcab242
am: c201aff50a  -s ours

Change-Id: Ie8b5e0cabb3abfa917653993f1010b3c5db7e5af

6 years agoMerge "Revert "AAPT: Modified StringPool uniqueness detection"" into pi-dev
Ryan Mitchell [Mon, 16 Apr 2018 19:28:43 +0000 (19:28 +0000)]
Merge "Revert "AAPT: Modified StringPool uniqueness detection"" into pi-dev

6 years agoMerge "Enable feature flag for audio output switcher." into pi-dev
Caxton Chan [Mon, 16 Apr 2018 19:24:31 +0000 (19:24 +0000)]
Merge "Enable feature flag for audio output switcher." into pi-dev

6 years ago[automerger skipped] Merge "DO NOT MERGE (O) Revoke permision when group changed...
Philip P. Moltmann [Mon, 16 Apr 2018 18:55:42 +0000 (11:55 -0700)]
[automerger skipped] Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev am: cda08919cf am: d139755de8
am: 5e2a5a8ce1  -s ours

Change-Id: I665c1f65a60926a70627db83da5c2c6f3e4f09c8

6 years agoMerge "Add new function to get audio state" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 18:34:37 +0000 (18:34 +0000)]
Merge "Add new function to get audio state" into pi-dev

6 years agoRevert "AAPT: Modified StringPool uniqueness detection"
Ryan Mitchell [Mon, 16 Apr 2018 18:21:14 +0000 (18:21 +0000)]
Revert "AAPT: Modified StringPool uniqueness detection"

This reverts commit 35ecb89a8aa68f24d2e991df5bb9964ad15075dc.

Reason for revert: <Long make duration (infinite loop)>

Change-Id: I10d1cf53ca3054d40e23b06368ebaff6af69beab

6 years agoMerge "Update PackageManager.getInstalledPackages() docs" into pi-dev
Ricky Wai [Mon, 16 Apr 2018 18:19:00 +0000 (18:19 +0000)]
Merge "Update PackageManager.getInstalledPackages() docs" into pi-dev

6 years agoMerge "Add logging to ScheduleConditionProvider" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 17:38:34 +0000 (17:38 +0000)]
Merge "Add logging to ScheduleConditionProvider" into pi-dev

6 years agoMerge "Remove temporary logging." into pi-dev
Bryce Lee [Mon, 16 Apr 2018 17:36:45 +0000 (17:36 +0000)]
Merge "Remove temporary logging." into pi-dev

6 years agoMerge "AAPT: Modified StringPool uniqueness detection" into pi-dev
Ryan Mitchell [Mon, 16 Apr 2018 17:15:53 +0000 (17:15 +0000)]
Merge "AAPT: Modified StringPool uniqueness detection" into pi-dev

6 years agoMerge "Unpin bitmaps but don't purge all scratch resources." into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 17:05:45 +0000 (17:05 +0000)]
Merge "Unpin bitmaps but don't purge all scratch resources." into pi-dev

6 years agoThe file CachedBluetoothDeviceManager.java performs synchronization
Isha Bobra [Thu, 5 Apr 2018 20:27:47 +0000 (13:27 -0700)]
The file CachedBluetoothDeviceManager.java performs synchronization
at class level. This CL just adds the missing synchronization bits.

Test: Manual
Change-Id: I71e0a194f8d126c2898a4086d6bcb62156cab9ad
Bug: 77849851

6 years agoMerge "Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""" into pi-dev
Jeff Sharkey [Mon, 16 Apr 2018 16:54:32 +0000 (16:54 +0000)]
Merge "Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""" into pi-dev

6 years agoMerge "Revert "ViewRoot: Ensure we release surface from setWindowStopped."" into...
TreeHugger Robot [Mon, 16 Apr 2018 16:50:48 +0000 (16:50 +0000)]
Merge "Revert "ViewRoot: Ensure we release surface from setWindowStopped."" into pi-dev

6 years agoRevert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""
Jeff Sharkey [Mon, 16 Apr 2018 16:50:34 +0000 (16:50 +0000)]
Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""

This reverts commit bd2a9a2915c17cbe2100d6d2077568d0936cd719.

Reason for revert: ijpedowitz@

Bug: 77662908
Change-Id: I596d330d64942105f447bb613012bb11e281a805
Exempt-From-Owner-Approval: keep tests passing

6 years agoMerge "Revert "OP_GET_USAGE_STATS should be noted, not checked."" into pi-dev
Jeff Sharkey [Mon, 16 Apr 2018 16:50:06 +0000 (16:50 +0000)]
Merge "Revert "OP_GET_USAGE_STATS should be noted, not checked."" into pi-dev

6 years agoMerge "Show only 1 entry for hearing aid device after killing the activity." into...
Isha Bobra [Mon, 16 Apr 2018 16:42:33 +0000 (16:42 +0000)]
Merge "Show only 1 entry for hearing aid device after killing the activity." into pi-dev

6 years agoRevert "OP_GET_USAGE_STATS should be noted, not checked."
Jeff Sharkey [Mon, 16 Apr 2018 16:39:55 +0000 (16:39 +0000)]
Revert "OP_GET_USAGE_STATS should be noted, not checked."

This reverts commit 5a8bcd90315c24e2f16176fd13922b2a92752cd5.

Reason for revert: ijpedowitz@

Bug: 77662908
Change-Id: I5dd0ad5038df90ea8a80ba6f583ee46fb24600c2
Exempt-From-Owner-Approval: keep tests passing

6 years agoMerge "Convert the BrightnessController to a log scale control." into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 16:18:34 +0000 (16:18 +0000)]
Merge "Convert the BrightnessController to a log scale control." into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 16:08:18 +0000 (16:08 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge changes I478047cc,Ibe16ffd7 into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 16:07:27 +0000 (16:07 +0000)]
Merge changes I478047cc,Ibe16ffd7 into pi-dev

* changes:
  DisplayCutout: Ensure stable insets cover top cutout
  Cutout: Use stable density for inflating simulated cutouts

6 years agoMerge "Skip cross-user/profile check for start activity pending intents." into pi-dev
Makoto Onuki [Mon, 16 Apr 2018 15:55:36 +0000 (15:55 +0000)]
Merge "Skip cross-user/profile check for start activity pending intents." into pi-dev

6 years agoAdd logging to ScheduleConditionProvider
Beverly [Mon, 16 Apr 2018 15:42:40 +0000 (11:42 -0400)]
Add logging to ScheduleConditionProvider

Test: n/a
Bug: 77906756
Change-Id: Icfc0cbaf6d53315e437ac3ea3ab693b3e0703d2f

6 years agoRevert "ViewRoot: Ensure we release surface from setWindowStopped."
Chavi Weingarten [Mon, 16 Apr 2018 15:34:45 +0000 (15:34 +0000)]
Revert "ViewRoot: Ensure we release surface from setWindowStopped."

This reverts commit 35274cb0ce90ce4381e534d1c04c9d919eb588fc.

Reason for revert: b/78110749
Fixes: 78110749

Change-Id: Ib1b15e4f7325cb265574090b658514fc0b3c4021

6 years agoMerge "Fix "auto battery saver notification comes back"" into pi-dev
Makoto Onuki [Mon, 16 Apr 2018 15:32:20 +0000 (15:32 +0000)]
Merge "Fix "auto battery saver notification comes back"" into pi-dev

6 years agoMerge "Cutout: Fix broken cutout rendering in landscape" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 15:20:04 +0000 (15:20 +0000)]
Merge "Cutout: Fix broken cutout rendering in landscape" into pi-dev

6 years agoMerge "Add more hidden API on light greylist" into pi-dev
David Brazdil [Mon, 16 Apr 2018 15:04:07 +0000 (15:04 +0000)]
Merge "Add more hidden API on light greylist" into pi-dev

6 years agoDisplayCutout: Ensure stable insets cover top cutout
Adrian Roos [Mon, 16 Apr 2018 14:56:07 +0000 (16:56 +0200)]
DisplayCutout: Ensure stable insets cover top cutout

Fixes an issue where the stable insets could become smaller
than the top cutout if the display density was set lower
than the natural density.

Bug: 78110564
Test: Set display size to "small", turn on cutout, verify apps do not have a gap between status bar and content.
Change-Id: I478047ccaade0e4e265cc57d03b072ae578b49d0

6 years agoMerge "Added screen brightness override feedback." into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 14:48:38 +0000 (14:48 +0000)]
Merge "Added screen brightness override feedback." into pi-dev

6 years agoMerge "Doc change: removed reference to the reverted Password Blacklist feature....
TreeHugger Robot [Mon, 16 Apr 2018 14:48:19 +0000 (14:48 +0000)]
Merge "Doc change: removed reference to the reverted Password Blacklist feature." into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 14:26:28 +0000 (14:26 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 14:22:12 +0000 (14:22 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoCutout: Use stable density for inflating simulated cutouts
Adrian Roos [Mon, 16 Apr 2018 14:12:40 +0000 (16:12 +0200)]
Cutout: Use stable density for inflating simulated cutouts

Change-Id: Ibe16ffd792040e753d54d7085ba74e8880de111e
Fixes: 77961334
Test: Set density to Very large, enable simulated cutout, verify it still looks reasonable.

6 years agoCutout: Fix broken cutout rendering in landscape
Adrian Roos [Mon, 16 Apr 2018 14:03:04 +0000 (16:03 +0200)]
Cutout: Fix broken cutout rendering in landscape

Change-Id: I835fd7fa06dfcc0eff0323efe8f2913b9e1239b8
Fixes: 77960411
Test: Simulate cutout, rotate to landscape, verify cutout is still visible.

6 years agoConvert the BrightnessController to a log scale control.
Michael Wright [Fri, 13 Apr 2018 17:15:27 +0000 (18:15 +0100)]
Convert the BrightnessController to a log scale control.

Currently, the BrightnessController's UI is a linear scale control on
top of a linear backlight control, but humans perceive brightness on a
roughly logarithmic scale. By moving to a non-linear control, we both
give users more fine-grained control over the brightness of the display
as well as a UI that works more intuitively.

Test: manual
Bug: 73810208
Change-Id: I67090ad7c4ced0420314458473c9124cb9c61906

6 years agoDoc change: removed reference to the reverted Password Blacklist feature.
Benjamin Miller [Mon, 16 Apr 2018 12:54:43 +0000 (12:54 +0000)]
Doc change: removed reference to the reverted Password Blacklist feature.

Bug: 73750934
Test: make ds-docs and inspected HTML output.

Change-Id: I545ef13219dc994a4f157cc6f2380eac59331498

6 years agoMerge "Bouncer visibility fixes" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 11:30:37 +0000 (11:30 +0000)]
Merge "Bouncer visibility fixes" into pi-dev

6 years agoAdd more hidden API on light greylist
David Brazdil [Mon, 16 Apr 2018 11:05:41 +0000 (12:05 +0100)]
Add more hidden API on light greylist

Bug: 64382372
Bug: 78019806
Bug: 77982395
Bug: 77862070
Bug: 77860747
Bug: 77785209
Bug: 77814672
Bug: 77760092
Test: make
Change-Id: I78643c355801241a2e02f16f986a7a5d14d79823

6 years agoBouncer visibility fixes
Lucas Dupin [Mon, 16 Apr 2018 06:50:20 +0000 (14:50 +0800)]
Bouncer visibility fixes

Test: go/sysui-bouncer-tests
Change-Id: Iaf6e0ded57eb3b737cfd074bbc750aa6977e36b2
Fixes: 77921840

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 16 Apr 2018 08:19:56 +0000 (01:19 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I458b91bd87cd73ec887a9581ed1d4d2527513bd4

6 years agoMerge "Guard the SSID with NETWORK_SETTINGS" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 05:40:17 +0000 (05:40 +0000)]
Merge "Guard the SSID with NETWORK_SETTINGS" into pi-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 16 Apr 2018 04:48:28 +0000 (21:48 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I06dbe1dfd8098c454295925a57df4e1ac7a41d7e

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 04:42:35 +0000 (04:42 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoGuard the SSID with NETWORK_SETTINGS
Chalard Jean [Mon, 16 Apr 2018 03:25:22 +0000 (12:25 +0900)]
Guard the SSID with NETWORK_SETTINGS

Bug: 77865258
Test: manual
Change-Id: I01d4ec7366382d42847c823ae6056222a012c504

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 16 Apr 2018 04:29:07 +0000 (21:29 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I61e1929cbf38843fcce516c103cd51e4e03ae10c

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 9b8bceedc2 skipped...
Bill Yi [Mon, 16 Apr 2018 00:08:34 +0000 (17:08 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 9b8bceedc2 skipped: 1789ac6b28 am: d12aff917a  -s ours
am: 06e9f9dad5  -s ours

Change-Id: I87341fd783f4e18607921d0023c0a8d9bb2cdaf6

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 9b8bceedc2 skipped...
Bill Yi [Mon, 16 Apr 2018 00:03:09 +0000 (17:03 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 9b8bceedc2 skipped: 1789ac6b28
am: d12aff917a  -s ours

Change-Id: I7400a1e8da6fde612c5b130228b28cf25ce5b99c

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 15 Apr 2018 14:16:58 +0000 (07:16 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I5dc789af62825582ca94133ab6721152b2b6871f

6 years agoAdd new function to get audio state
hughchen [Sat, 31 Mar 2018 09:32:53 +0000 (17:32 +0800)]
Add new function to get audio state

* Add getAudioState()
* Add isA2dpDevice() and isHfpDevice() in CachedBluetoothDevice

Bug: 74134939
Test: make RunSettingsLibRoboTests -j40
Change-Id: I18f4c1fcad0325a57de379f5ffe5b1135a00d084

6 years agoMerge "Respect light nav bar flag set by IME on keyguard" into pi-dev
TreeHugger Robot [Sun, 15 Apr 2018 02:55:53 +0000 (02:55 +0000)]
Merge "Respect light nav bar flag set by IME on keyguard" into pi-dev

6 years agoMerge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev am: 6173fbe12e
Philip P. Moltmann [Sun, 15 Apr 2018 00:36:23 +0000 (17:36 -0700)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev am: 6173fbe12e
am: 6a845fe056

Change-Id: I5aebe2f67ad5f0f748db1b45c2b4ad6a1c4df530

6 years agoMerge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev
Philip P. Moltmann [Sun, 15 Apr 2018 00:26:51 +0000 (17:26 -0700)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev
am: 6173fbe12e

Change-Id: I9f8435dbdee7c532c68542e5a1de75e97dfc6dea

6 years ago[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53...
Philip P. Moltmann [Sun, 15 Apr 2018 00:25:40 +0000 (17:25 -0700)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53 am: 5630564178 am: 90cb8f7b6e skipped: 275e6bf1b4 am: 1bbc69d8f5 am: 8dbf706e9f am: 874fe98a8f am: 9b71a72cb0 skipped: f1776f0805 am: 877a845005
am: 885bcab242

Change-Id: Iec02fbfef86e421f0c7b6efc8dd49184bc39a6be

6 years ago[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53...
Philip P. Moltmann [Sun, 15 Apr 2018 00:14:53 +0000 (17:14 -0700)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53 am: 5630564178 am: 90cb8f7b6e skipped: 275e6bf1b4 am: 1bbc69d8f5 am: 8dbf706e9f am: 874fe98a8f am: 9b71a72cb0 skipped: f1776f0805
am: 877a845005

Change-Id: Ifd815fa2dcabe164a7445654ac9f2374c7a7db9e

6 years agoMerge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev am: cda08919cf
Philip P. Moltmann [Sat, 14 Apr 2018 23:37:25 +0000 (16:37 -0700)]
Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev am: cda08919cf
am: d139755de8

Change-Id: I3607d28823ced42c14d39d99bbfd8ea346cfc835

6 years agoMerge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev
Philip P. Moltmann [Sat, 14 Apr 2018 23:28:15 +0000 (16:28 -0700)]
Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev
am: cda08919cf

Change-Id: I949f16944d202078a1f191a1284f1c48a46cbb58

6 years agoMerge "Add new category key for ConnectDeviceFrag" into pi-dev
TreeHugger Robot [Sat, 14 Apr 2018 23:12:48 +0000 (23:12 +0000)]
Merge "Add new category key for ConnectDeviceFrag" into pi-dev

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 9b8bceedc2 skipped...
Android Build Merger (Role) [Sat, 14 Apr 2018 23:05:14 +0000 (23:05 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 9b8bceedc2 skipped: 1789ac6b28

Change-Id: I07cc5ff54cd477b8ea8ff6a448f7bd3622a9eb8d

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 9b8bceedc2
Android Build Merger (Role) [Sat, 14 Apr 2018 23:05:09 +0000 (23:05 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 9b8bceedc2

Change-Id: Iaceae5c38f84ffe2ec85ea9b7219da86a857487c

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 14 Apr 2018 23:04:25 +0000 (16:04 -0700)]
Import translations. DO NOT MERGE

Change-Id: I81ee67e251052ffde639e2cef623bce67b81d4f2
Auto-generated-cl: translation import

6 years ago[automerger skipped] Merge "DO NOT MERGE (O) Revoke permision when group changed...
Philip P. Moltmann [Sat, 14 Apr 2018 22:48:31 +0000 (15:48 -0700)]
[automerger skipped] Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-mr1-dev
am: 4cfd9bb78d  -s ours

Change-Id: I2b84b8b8cf53a5a1aef7e5a7169c3c6bd42e3ecc

6 years agoAddress visual inconsistency in smart replies
Milo Sredkov [Thu, 12 Apr 2018 11:52:43 +0000 (12:52 +0100)]
Address visual inconsistency in smart replies

Address the major style differences and make the smart reply buttons
fit better with the other notification UI elements.

This CL does not yet address all the isues but removes the most
obvious inconsistencies.

Screenshot before: https://screenshot.googleplex.com/90QVvxJmUJ3.png
Screenshot after: https://screenshot.googleplex.com/2C8cMQgTVBG.png

Bug: 73605520
Test: In Notify post a Messaging notification with Large chices

Change-Id: Ide285c21c7bf83e9f06ade6912fd13cb3e4b9024

6 years agoMerge "Don't create recovery snapshot until it contains at least one key." into pi-dev
TreeHugger Robot [Sat, 14 Apr 2018 16:39:30 +0000 (16:39 +0000)]
Merge "Don't create recovery snapshot until it contains at least one key." into pi-dev

6 years agoMerge "Add an action to launch scanning settings" into pi-dev
TreeHugger Robot [Sat, 14 Apr 2018 02:35:28 +0000 (02:35 +0000)]
Merge "Add an action to launch scanning settings" into pi-dev

6 years agoMerge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev
TreeHugger Robot [Sat, 14 Apr 2018 02:21:07 +0000 (02:21 +0000)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev

* changes:
  [automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627 am: 419b357806 am: 1111596b93 am: abbad1d1d7 skipped: f421873d6f
  [automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627 am: 419b357806 am: 1111596b93 am: abbad1d1d7
  [automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627 am: 419b357806 am: 1111596b93
  [automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627 am: 419b357806
  [automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627
  DO NOT MERGE (N) Revoke permision when group changed

6 years agoMerge changes from topic "ClearGrantIfGroupChanged-nyc" into nyc-mr2-dev
TreeHugger Robot [Sat, 14 Apr 2018 02:21:07 +0000 (02:21 +0000)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627 am: 419b357806 am: 1111596b93 am: abbad1d1d7
  [automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627 am: 419b357806 am: 1111596b93
  [automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627 am: 419b357806
  [automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627
  DO NOT MERGE (N) Revoke permision when group changed

6 years agoMerge "DO NOT MERGE (O) Revoke permision when group changed" into oc-mr1-dev
Philip P. Moltmann [Sat, 14 Apr 2018 01:09:04 +0000 (01:09 +0000)]
Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-mr1-dev

6 years ago[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53...
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:56 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53 am: 5630564178 am: 90cb8f7b6e skipped: 275e6bf1b4 am: 1bbc69d8f5 am: 8dbf706e9f am: 874fe98a8f am: 9b71a72cb0 skipped: f1776f0805

Change-Id: I18b5a81159834936591727793777557749128589

6 years ago[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53...
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:52 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53 am: 5630564178 am: 90cb8f7b6e skipped: 275e6bf1b4 am: 1bbc69d8f5 am: 8dbf706e9f am: 874fe98a8f am: 9b71a72cb0

Change-Id: Ib6b064e5ea956d7ecd98bb3f7c04bbc43dc783ba

6 years ago[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53...
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:46 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53 am: 5630564178 am: 90cb8f7b6e skipped: 275e6bf1b4 am: 1bbc69d8f5 am: 8dbf706e9f am: 874fe98a8f

Change-Id: Idea79fe96e755a47851bee4779bd1d7f589881f5

6 years ago[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53...
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:41 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53 am: 5630564178 am: 90cb8f7b6e skipped: 275e6bf1b4 am: 1bbc69d8f5 am: 8dbf706e9f

Change-Id: If22b28a0ed93f1ab3fb0380ebc67281591720e24

6 years ago[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53...
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:35 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53 am: 5630564178 am: 90cb8f7b6e skipped: 275e6bf1b4 am: 1bbc69d8f5

Change-Id: I5f5ba660e59867e17a5cd0f8dcfb0afb2f3060da

6 years ago[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53...
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:25 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53 am: 5630564178 am: 90cb8f7b6e skipped: 275e6bf1b4

Change-Id: I40f818e3e3174645c8786263ddbe6428ce927084

6 years ago[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53...
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:19 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53 am: 5630564178 am: 90cb8f7b6e

Change-Id: I12743702ec15b7d92b0197496e8a3426777ed4db

6 years ago[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53...
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:14 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53 am: 5630564178

Change-Id: I5220d4063a27154243b74e7cd43dc8fd8ffdeb51

6 years ago[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:08 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53

Change-Id: Ie178331d03d590e50a81117498a0f5dabe4d83ae

6 years agoDO NOT MERGE (M) Revoke permision when group changed
Philip P. Moltmann [Thu, 12 Apr 2018 23:44:43 +0000 (16:44 -0700)]
DO NOT MERGE (M) Revoke permision when group changed

If a run time permission of a group is already granted we grant the
other permission of the group automatically when requested.

Hence if an already granted permission changed its group during an
update suddenly permission of a potentially not approved group will
get auto-granted.

This is undesirable, hence we revoke the permission during the update
process.

Test: atest android.permission.cts.PermissionGroupChange
Bug: 72710897
Change-Id: Ib2165d1ae53b80455ebe02e07775853e37a2e339

6 years ago[automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627...
Android Build Merger (Role) [Sat, 14 Apr 2018 01:05:08 +0000 (01:05 +0000)]
[automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627 am: 419b357806 am: 1111596b93 am: abbad1d1d7 skipped: f421873d6f

Change-Id: Ic67fd7dadddf7a727dc075cba0fcfa8db7984512

6 years ago[automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627...
Android Build Merger (Role) [Sat, 14 Apr 2018 01:05:02 +0000 (01:05 +0000)]
[automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627 am: 419b357806 am: 1111596b93 am: abbad1d1d7

Change-Id: I92684e1b95d265795996222d869ab1457a97dbe2

6 years ago[automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627...
Android Build Merger (Role) [Sat, 14 Apr 2018 01:04:55 +0000 (01:04 +0000)]
[automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627 am: 419b357806 am: 1111596b93

Change-Id: I31c8e9d69b1234c7e63c8c45385e7bf743a10b7c

6 years ago[automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627...
Android Build Merger (Role) [Sat, 14 Apr 2018 01:04:49 +0000 (01:04 +0000)]
[automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627 am: 419b357806

Change-Id: I4253d70e283336dfd52f821d5a649b8caf2bfd01

6 years ago[automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627
Android Build Merger (Role) [Sat, 14 Apr 2018 01:04:40 +0000 (01:04 +0000)]
[automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627

Change-Id: Ib1696ad75e93be83eef20dd016eff2d83462ea92

6 years agoDO NOT MERGE (N) Revoke permision when group changed
Philip P. Moltmann [Thu, 12 Apr 2018 20:48:13 +0000 (13:48 -0700)]
DO NOT MERGE (N) Revoke permision when group changed

If a run time permission of a group is already granted we grant the
other permission of the group automatically when requested.

Hence if an already granted permission changed its group during an
update suddenly permission of a potentially not approved group will
get auto-granted.

This is undesirable, hence we revoke the permission during the update
process.

Test: atest android.permission.cts.PermissionGroupChange
Bug: 72710897
Change-Id: Ib2165d1ae53b80455ebe02e07775853e37a2e339

6 years agoMerge "(P) Revoke permision when group changed" into pi-dev
TreeHugger Robot [Sat, 14 Apr 2018 00:55:22 +0000 (00:55 +0000)]
Merge "(P) Revoke permision when group changed" into pi-dev

6 years agoMerge "Fix facetbuttons selection It didn't work when apps where in a virtual or...
TreeHugger Robot [Sat, 14 Apr 2018 00:45:15 +0000 (00:45 +0000)]
Merge "Fix facetbuttons selection It didn't work when apps where in a virtual or secondary dispaly" into pi-dev

6 years agoMerge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev
TreeHugger Robot [Sat, 14 Apr 2018 00:35:38 +0000 (00:35 +0000)]
Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev

6 years agoMerge "Use heif embedded thumbnail if available" into pi-dev
TreeHugger Robot [Sat, 14 Apr 2018 00:23:37 +0000 (00:23 +0000)]
Merge "Use heif embedded thumbnail if available" into pi-dev

6 years agoMerge "Benchmarks for streams." into pi-dev
Jeff Sharkey [Sat, 14 Apr 2018 00:11:30 +0000 (00:11 +0000)]
Merge "Benchmarks for streams." into pi-dev

6 years agoMerge "Return "null" cycles for deprecated callers." into pi-dev
TreeHugger Robot [Sat, 14 Apr 2018 00:11:15 +0000 (00:11 +0000)]
Merge "Return "null" cycles for deprecated callers." into pi-dev

6 years agoMerge "Only check bg restriction if an app is idle" into pi-dev
TreeHugger Robot [Sat, 14 Apr 2018 00:07:51 +0000 (00:07 +0000)]
Merge "Only check bg restriction if an app is idle" into pi-dev

6 years agoMerge "OP_GET_USAGE_STATS should be noted, not checked." into pi-dev
Jeff Sharkey [Fri, 13 Apr 2018 23:58:44 +0000 (23:58 +0000)]
Merge "OP_GET_USAGE_STATS should be noted, not checked." into pi-dev

6 years agoMerge "Add HFP/HearingAid set/get action device to greylist" into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 23:51:24 +0000 (23:51 +0000)]
Merge "Add HFP/HearingAid set/get action device to greylist" into pi-dev

6 years agoMerge "Correct lookback for while-idle alarm rate limiting" into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 23:43:26 +0000 (23:43 +0000)]
Merge "Correct lookback for while-idle alarm rate limiting" into pi-dev

6 years agoAdd an action to launch scanning settings
Lifu Tang [Thu, 12 Apr 2018 17:13:15 +0000 (10:13 -0700)]
Add an action to launch scanning settings

Needs to launch scanning settings from other apps

Bug: 77823544
Test: build and flash
Change-Id: If02b359dcbfee79b34b6b66abb3cf36a2a3412e3

6 years agoAAPT: Modified StringPool uniqueness detection
y [Fri, 13 Apr 2018 18:25:12 +0000 (11:25 -0700)]
AAPT: Modified StringPool uniqueness detection

b/77862560 detected that when converting an apk to binary using aapt2,
all resource ids of attributes that have been replaced with resource
identifiers become set to the identifier of the first attribute. This is
because the attribute names are all empty because the names are not necessary
since the resource ids are present. The empty attribute names all map to
the same string pool reference and cause all the ids to be the first
empty string into the string pool.

Bug: 77862560
Test: Converted apk in listed bug from proto to binary and observed
correct resource ids and correct badging.

Change-Id: I635c13cd1ad7a395fe40a57198cfe5ec91602d01

6 years agoMerge "Don't process broadcasts until really ready." into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 23:03:17 +0000 (23:03 +0000)]
Merge "Don't process broadcasts until really ready." into pi-dev

6 years agoMerge "Add constant for bluetooth fragment" into pi-dev
TreeHugger Robot [Fri, 13 Apr 2018 23:00:51 +0000 (23:00 +0000)]
Merge "Add constant for bluetooth fragment" into pi-dev

6 years agoFix "auto battery saver notification comes back"
Makoto Onuki [Fri, 13 Apr 2018 22:53:57 +0000 (15:53 -0700)]
Fix "auto battery saver notification comes back"

Bug: 78017511
Test: Manual:
- Run them:
adb shell settings delete global low_power
adb shell settings delete global low_power_sticky
adb shell settings delete global low_power_trigger_level
adb shell settings delete secure low_power_manual_activation_count
adb shell settings delete secure low_power_warning_acknowledged
adb shell settings delete secure suppress_auto_battery_saver_suggestion
- Unplug
- Toggle BS 4 times -> the "Tap to schedule battery saver" notification shows up
- Dismiss the notification
- Wait until the battery percent drops
- Make sure the notification stays dismissed.

Change-Id: I82cbd0110ab5d140c9e9b5b449577040e51032c6