OSDN Git Service

android-x86/frameworks-base.git
6 years ago[automerger skipped] Merge "Add CallAudioState ctor as TestApi" am: 39ac9ffe27 am...
Hall Liu [Wed, 30 May 2018 23:02:11 +0000 (16:02 -0700)]
[automerger skipped] Merge "Add CallAudioState ctor as TestApi" am: 39ac9ffe27 am: f06c6d0187  -s ours
am: 1d09efefeb  -s ours

Change-Id: I3ce9e1d994c4f686d881a3a322ef8a5c40187334

6 years ago[automerger skipped] Merge "Check for bpf support at NetworkStatsService start" am...
Chenbo Feng [Wed, 30 May 2018 22:32:01 +0000 (15:32 -0700)]
[automerger skipped] Merge "Check for bpf support at NetworkStatsService start" am: 0defa6e72c am: 8196301e24  -s ours
am: 56eaecd57d  -s ours

Change-Id: I744e7fd2e6e8d4a68404c7a9d924da321ff94ba0

6 years ago[automerger skipped] Merge "Add CallAudioState ctor as TestApi" am: 39ac9ffe27
Hall Liu [Wed, 30 May 2018 22:28:18 +0000 (15:28 -0700)]
[automerger skipped] Merge "Add CallAudioState ctor as TestApi" am: 39ac9ffe27
am: f06c6d0187  -s ours

Change-Id: Ic6ae00ffdf13aff3b3c081c2b00cefbfa1412d6f

6 years agoMerge "Show back button when launcher is disconnected from proxy service" into pi...
Matthew Ng [Wed, 30 May 2018 22:20:29 +0000 (15:20 -0700)]
Merge "Show back button when launcher is disconnected from proxy service" into pi-dev am: d2de50b995
am: 536c5bbb8a

Change-Id: I10ee4c710e661823e31da71ad6699e55cbed1640

6 years ago[automerger skipped] Merge "Check for bpf support at NetworkStatsService start" am...
Chenbo Feng [Wed, 30 May 2018 22:17:21 +0000 (15:17 -0700)]
[automerger skipped] Merge "Check for bpf support at NetworkStatsService start" am: 0defa6e72c
am: 8196301e24  -s ours

Change-Id: I4b8e1669b80040287dd96423e8384e189db4af2d

6 years agoMerge "Fixed a bug where sometimes unhandled handler would consume all keys" into...
Evan Rosky [Wed, 30 May 2018 22:10:41 +0000 (15:10 -0700)]
Merge "Fixed a bug where sometimes unhandled handler would consume all keys" into pi-dev am: 7ba4c2b254
am: 9bf11ede69

Change-Id: I3e1eb6884cedb86ec144e5ada09b4252ee266c96

6 years agoMerge "Show back button when launcher is disconnected from proxy service" into pi-dev
Matthew Ng [Wed, 30 May 2018 22:10:41 +0000 (15:10 -0700)]
Merge "Show back button when launcher is disconnected from proxy service" into pi-dev
am: d2de50b995

Change-Id: I8dbe77b963e0f6547c33ea1363c4c940eaf27fd8

6 years agoMerge "Add CallAudioState ctor as TestApi"
Hall Liu [Wed, 30 May 2018 22:09:21 +0000 (15:09 -0700)]
Merge "Add CallAudioState ctor as TestApi"
am: 39ac9ffe27

Change-Id: I7ecc3c81927b58bddb5ae12f254be0c09133672a

6 years agoMerge "Check for bpf support at NetworkStatsService start"
Chenbo Feng [Wed, 30 May 2018 22:05:08 +0000 (15:05 -0700)]
Merge "Check for bpf support at NetworkStatsService start"
am: 0defa6e72c

Change-Id: Ia2b5c8c7b7185787fee57281727b366752ef887f

6 years agoMerge "Fixed a bug where sometimes unhandled handler would consume all keys" into...
Evan Rosky [Wed, 30 May 2018 22:02:51 +0000 (15:02 -0700)]
Merge "Fixed a bug where sometimes unhandled handler would consume all keys" into pi-dev
am: 7ba4c2b254

Change-Id: Ia7fab42d36c8b58b05656cc2e5d1253449becf96

6 years agoMerge "Show back button when launcher is disconnected from proxy service" into pi-dev
TreeHugger Robot [Wed, 30 May 2018 21:55:54 +0000 (21:55 +0000)]
Merge "Show back button when launcher is disconnected from proxy service" into pi-dev

6 years agoMerge "Fixed a bug where sometimes unhandled handler would consume all keys" into...
Evan Rosky [Wed, 30 May 2018 21:47:25 +0000 (21:47 +0000)]
Merge "Fixed a bug where sometimes unhandled handler would consume all keys" into pi-dev

6 years agoMerge "Fixed an issue where group children had rounded corners" into pi-dev am: f04b6...
Selim Cinek [Wed, 30 May 2018 21:06:43 +0000 (14:06 -0700)]
Merge "Fixed an issue where group children had rounded corners" into pi-dev am: f04b6c8d77
am: a58f9fcd79

Change-Id: I77e39a652ea589c88c72e5a5875da74d5bbcd0d1

6 years agoMerge "Fixed an issue where group children had rounded corners" into pi-dev
Selim Cinek [Wed, 30 May 2018 20:52:22 +0000 (13:52 -0700)]
Merge "Fixed an issue where group children had rounded corners" into pi-dev
am: f04b6c8d77

Change-Id: I0c6aacd977ab50acac2b69b9ea86d4039c512987

6 years agoMerge "Fixed an issue where group children had rounded corners" into pi-dev
TreeHugger Robot [Wed, 30 May 2018 20:26:45 +0000 (20:26 +0000)]
Merge "Fixed an issue where group children had rounded corners" into pi-dev

6 years agoMerge "Add CallAudioState ctor as TestApi"
Hall Liu [Wed, 30 May 2018 20:24:34 +0000 (20:24 +0000)]
Merge "Add CallAudioState ctor as TestApi"

6 years agoMerge "remove feature flag for DeviceInfoSettings in Settings"
TreeHugger Robot [Wed, 30 May 2018 20:14:51 +0000 (20:14 +0000)]
Merge "remove feature flag for DeviceInfoSettings in Settings"

6 years agoMerge "Check for bpf support at NetworkStatsService start"
Treehugger Robot [Wed, 30 May 2018 19:54:42 +0000 (19:54 +0000)]
Merge "Check for bpf support at NetworkStatsService start"

6 years agoMerge "MediaCodec.CryptoInfo: expose subsample encryption pattern" into pi-dev am...
Robert Shih [Wed, 30 May 2018 18:30:25 +0000 (11:30 -0700)]
Merge "MediaCodec.CryptoInfo: expose subsample encryption pattern" into pi-dev am: e3348a2593
am: ef157649d5

Change-Id: I38a9da260726d0a07366047662be57a6e4bf8fd0

6 years agoShow back button when launcher is disconnected from proxy service
Matthew Ng [Wed, 30 May 2018 18:27:39 +0000 (11:27 -0700)]
Show back button when launcher is disconnected from proxy service

Whenever service is disconnected, the back button will be shown. Once
the service is connected, launcher will decide whether or not to hide
the back button.

Test: adb shell am force-stop com.google.android.apps.nexuslauncher
Change-Id: Ic947e51c00abd9591c800aa1023b8d9684dc5d93
Fixes: 80098608

6 years agoCheck for bpf support at NetworkStatsService start
Chenbo Feng [Sat, 19 May 2018 00:10:07 +0000 (17:10 -0700)]
Check for bpf support at NetworkStatsService start

The current implementation check for bpf map existance whenever a
NetworkStats request comes in. The check is not efficient and may
require additional permission for threads. So a member variable is added
to NetworkStatsService to store the bpf configuration status and is
initialized when NetworkStatsService start.

Test: -m CtsNetTestCases -t android.net.cts.TrafficStatsTest
      -m CtsUsageStatsTestCases -t android.app.usage.cts.NetworkUsageStatsTest
Bug: 79994577

Change-Id: I872ae18fb3e9631a4e6c4d773fefbba32e60a03b
Merged-In: I872ae18fb3e9631a4e6c4d773fefbba32e60a03b

6 years agoMerge "MediaCodec.CryptoInfo: expose subsample encryption pattern" into pi-dev
Robert Shih [Wed, 30 May 2018 18:13:45 +0000 (11:13 -0700)]
Merge "MediaCodec.CryptoInfo: expose subsample encryption pattern" into pi-dev
am: e3348a2593

Change-Id: I6eaaabc353304ee29aa677bf03d94384ddede51c

6 years agoMerge "MediaCodec.CryptoInfo: expose subsample encryption pattern" into pi-dev
Robert Shih [Wed, 30 May 2018 17:43:58 +0000 (17:43 +0000)]
Merge "MediaCodec.CryptoInfo: expose subsample encryption pattern" into pi-dev

6 years agoFixed an issue where group children had rounded corners
Selim Cinek [Wed, 30 May 2018 16:55:36 +0000 (09:55 -0700)]
Fixed an issue where group children had rounded corners

Children that were close to the clipping boundary before
were not being reset when they were added as a child.
This could happen with auto groups when collapsed or
with heads up notifications.

Change-Id: I873b65da6778840c4542b4324f69d2ec9b5c1dc5
Fixes: 80276391
Test: add autobundleable children while collapsed, observe no corners

6 years agoMerge "Allow stats log printing from userdebug builds too."
TreeHugger Robot [Wed, 30 May 2018 17:07:15 +0000 (17:07 +0000)]
Merge "Allow stats log printing from userdebug builds too."

6 years agoMerge "Log WorkSource in dumpsys location"
TreeHugger Robot [Wed, 30 May 2018 16:30:42 +0000 (16:30 +0000)]
Merge "Log WorkSource in dumpsys location"

6 years agoAllow stats log printing from userdebug builds too.
Yao Chen [Wed, 30 May 2018 16:03:17 +0000 (09:03 -0700)]
Allow stats log printing from userdebug builds too.

Test: manually tested.
Change-Id: Id24153dfa9f1520f5037a7af1d54c90c690f99bc

6 years agoMerge changes from topic "rotation_config_update_fixes" into pi-dev am: e81a27f4aa
Andrii Kulian [Wed, 30 May 2018 15:55:36 +0000 (08:55 -0700)]
Merge changes from topic "rotation_config_update_fixes" into pi-dev am: e81a27f4aa
am: 82a188f0df

Change-Id: I93939850b01fbb323178f7e17d3f98123aa6fd04

6 years agoUpdate visibility and config at the same time am: f4479eef64
Andrii Kulian [Wed, 30 May 2018 15:51:06 +0000 (08:51 -0700)]
Update visibility and config at the same time am: f4479eef64
am: f14f166d06

Change-Id: I4bea3173a2e18647ba7ddde529b866bfdbb53dce

6 years agoDon't update configuration for invisible windows am: 3dcdf64cf6
Andrii Kulian [Wed, 30 May 2018 15:47:42 +0000 (08:47 -0700)]
Don't update configuration for invisible windows am: 3dcdf64cf6
am: fd592ffb63

Change-Id: Ic312ac2db980be5351cf3b76478d15b9f8d80f65

6 years agoDon't let top activity to influence the orientation am: 0918d3674f
Andrii Kulian [Wed, 30 May 2018 15:44:10 +0000 (08:44 -0700)]
Don't let top activity to influence the orientation am: 0918d3674f
am: 369055076e

Change-Id: I5f272244a56b1b3744b62c57a1e9b1f95a8f1177

6 years agoMerge changes from topic "rotation_config_update_fixes" into pi-dev
Andrii Kulian [Wed, 30 May 2018 15:29:00 +0000 (08:29 -0700)]
Merge changes from topic "rotation_config_update_fixes" into pi-dev
am: e81a27f4aa

Change-Id: I0cdb6e265d5b8c690e4115d39a86344b81dd956f

6 years agoUpdate visibility and config at the same time
Andrii Kulian [Wed, 30 May 2018 15:23:13 +0000 (08:23 -0700)]
Update visibility and config at the same time
am: f4479eef64

Change-Id: Ia16c263532bf8018b10f6dffdbc7b52d366babab

6 years agoDon't update configuration for invisible windows
Andrii Kulian [Wed, 30 May 2018 15:17:24 +0000 (08:17 -0700)]
Don't update configuration for invisible windows
am: 3dcdf64cf6

Change-Id: Ia64347043165aabfd663ed9d2cdefc7c42795957

6 years agoDon't let top activity to influence the orientation
Andrii Kulian [Wed, 30 May 2018 15:10:31 +0000 (08:10 -0700)]
Don't let top activity to influence the orientation
am: 0918d3674f

Change-Id: Ib75b8859f6bfbb034c1cd74f5f21cbae73da17c9

6 years agoMerge changes from topic "rotation_config_update_fixes" into pi-dev
Andrii Kulian [Wed, 30 May 2018 14:50:18 +0000 (14:50 +0000)]
Merge changes from topic "rotation_config_update_fixes" into pi-dev

* changes:
  Force-update the orientation of before sending to client
  Update visibility and config at the same time
  Don't update configuration for invisible windows
  Don't let top activity to influence the orientation

6 years agoMerge "Update onDeregistered docs to make capability change expectations clear."...
Tyler Gunn [Wed, 30 May 2018 14:47:11 +0000 (07:47 -0700)]
Merge "Update onDeregistered docs to make capability change expectations clear." into pi-dev am: 5025812860
am: 5823043e0c

Change-Id: Ia6d217c8669232b14eccf867b1e5826bb4a286d5

6 years agoMerge "Update onDeregistered docs to make capability change expectations clear."...
Tyler Gunn [Wed, 30 May 2018 14:37:35 +0000 (07:37 -0700)]
Merge "Update onDeregistered docs to make capability change expectations clear." into pi-dev
am: 5025812860

Change-Id: Id84d7761db866905a8c6850beca302f17674ba5f

6 years agoMerge "Update onDeregistered docs to make capability change expectations clear."...
Tyler Gunn [Wed, 30 May 2018 14:24:23 +0000 (14:24 +0000)]
Merge "Update onDeregistered docs to make capability change expectations clear." into pi-dev

6 years agoLog WorkSource in dumpsys location
Wyatt Riley [Tue, 22 May 2018 20:30:51 +0000 (13:30 -0700)]
Log WorkSource in dumpsys location

Bug: 79740043
Test: Runs, helpfully, on Pixel 2
Change-Id: Id4813c07a88b25b17c7cdf2c3f5acae8822510fa

6 years agoMerge "More greylisted APIs." into pi-dev am: 6d71fa791b
Nicolas Geoffray [Wed, 30 May 2018 12:08:34 +0000 (05:08 -0700)]
Merge "More greylisted APIs." into pi-dev am: 6d71fa791b
am: 28d10e9129

Change-Id: I94f662909f15a872e477a9d4220d721381a75acf

6 years agoMerge "More greylisted APIs." into pi-dev
Nicolas Geoffray [Wed, 30 May 2018 11:57:41 +0000 (04:57 -0700)]
Merge "More greylisted APIs." into pi-dev
am: 6d71fa791b

Change-Id: I343e80b48ce03daff53b3150f02463f8139d0662

6 years agoMerge "More greylisted APIs." into pi-dev
Nicolas Geoffray [Wed, 30 May 2018 11:45:46 +0000 (11:45 +0000)]
Merge "More greylisted APIs." into pi-dev

6 years agoMerge "Statsd: ISOLATED_UID_CHANGED out of batterystats"
TreeHugger Robot [Wed, 30 May 2018 11:36:27 +0000 (11:36 +0000)]
Merge "Statsd: ISOLATED_UID_CHANGED out of batterystats"

6 years agoMore greylisted APIs.
Nicolas Geoffray [Wed, 30 May 2018 09:51:48 +0000 (10:51 +0100)]
More greylisted APIs.

bug: 80447248
bug: 80444865
bug: 80441306
bug: 80441307
bug: 80440630

Test: m
Change-Id: I8be93884ad770f885fed1afb3864ea5322902bb1

6 years agoMerge "Allow for any default vibration intensity level." into pi-dev am: fb840c9170
Michael Wright [Wed, 30 May 2018 09:48:14 +0000 (02:48 -0700)]
Merge "Allow for any default vibration intensity level." into pi-dev am: fb840c9170
am: 4af6ded846

Change-Id: I436509b14ffc1a100293e36dedbddeceb53c362b

6 years agoMerge "Allow for any default vibration intensity level." into pi-dev
Michael Wright [Wed, 30 May 2018 09:38:47 +0000 (02:38 -0700)]
Merge "Allow for any default vibration intensity level." into pi-dev
am: fb840c9170

Change-Id: Ia1df028a9a0011f47ef2de6ec50e64c227c4b418

6 years agoMerge "Allow for any default vibration intensity level." into pi-dev
Michael Wright [Wed, 30 May 2018 09:28:22 +0000 (09:28 +0000)]
Merge "Allow for any default vibration intensity level." into pi-dev

6 years agoMerge "Use AAPT2 for more modules with manifest validation errors" am: ce1979d707...
Colin Cross [Wed, 30 May 2018 06:41:52 +0000 (23:41 -0700)]
Merge "Use AAPT2 for more modules with manifest validation errors" am: ce1979d707 am: da6fcd1f9a
am: 872accd1e0

Change-Id: I36ca83766ab9d5c0d54c9acdefb31838686028f8

6 years agoMerge "Use AAPT2 for more modules with manifest validation errors" am: ce1979d707
Colin Cross [Wed, 30 May 2018 06:31:12 +0000 (23:31 -0700)]
Merge "Use AAPT2 for more modules with manifest validation errors" am: ce1979d707
am: da6fcd1f9a

Change-Id: Ib73e574214064ba0c4112e901d9997724ecd7cb8

6 years agoMerge "Clear mDeferredHideWallpaper if wallpaper is being hidden"
Tiger Huang [Wed, 30 May 2018 06:26:48 +0000 (06:26 +0000)]
Merge "Clear mDeferredHideWallpaper if wallpaper is being hidden"

6 years agoMerge "Use AAPT2 for more modules with manifest validation errors"
Colin Cross [Wed, 30 May 2018 06:21:55 +0000 (23:21 -0700)]
Merge "Use AAPT2 for more modules with manifest validation errors"
am: ce1979d707

Change-Id: If52a42d9f2a95d5d957b177e36a7a14fd54bace9

6 years agoMerge "Cancel dark animation when new one arrives" into pi-dev am: 7c0e462b20
Lucas Dupin [Wed, 30 May 2018 05:47:55 +0000 (22:47 -0700)]
Merge "Cancel dark animation when new one arrives" into pi-dev am: 7c0e462b20
am: 59e792baeb

Change-Id: Ie5de6d2c5dd5fd871aa2a76e146be58377abc059

6 years agoMerge "Cancel dark animation when new one arrives" into pi-dev
Lucas Dupin [Wed, 30 May 2018 05:21:31 +0000 (22:21 -0700)]
Merge "Cancel dark animation when new one arrives" into pi-dev
am: 7c0e462b20

Change-Id: I055e40a9ce8aed257f14efd77677031a6656a034

6 years agoMerge "Cancel dark animation when new one arrives" into pi-dev
TreeHugger Robot [Wed, 30 May 2018 05:14:35 +0000 (05:14 +0000)]
Merge "Cancel dark animation when new one arrives" into pi-dev

6 years agoMerge "Use AAPT2 for more modules with manifest validation errors"
Colin Cross [Wed, 30 May 2018 05:01:08 +0000 (05:01 +0000)]
Merge "Use AAPT2 for more modules with manifest validation errors"

6 years agoMerge "Fix unwanted PIP window dismissal when moving to the bottom" into pi-dev am...
Tracy Zhou [Wed, 30 May 2018 04:54:53 +0000 (21:54 -0700)]
Merge "Fix unwanted PIP window dismissal when moving to the bottom" into pi-dev am: 5a0c1e1101
am: 471cf1b910

Change-Id: I57fc05f3e8b582b11ae90b26395b10365624239a

6 years agoMerge "Update mGlobalBluetoothA2dpOn when active device changed" into pi-dev am:...
Sungsoo Lim [Wed, 30 May 2018 04:44:52 +0000 (21:44 -0700)]
Merge "Update mGlobalBluetoothA2dpOn when active device changed" into pi-dev am: babf190396
am: a51ceb590b

Change-Id: I65491f578c654578ec9feb34768fb553323285a4

6 years agoMerge "Fix unwanted PIP window dismissal when moving to the bottom" into pi-dev
Tracy Zhou [Wed, 30 May 2018 04:44:31 +0000 (21:44 -0700)]
Merge "Fix unwanted PIP window dismissal when moving to the bottom" into pi-dev
am: 5a0c1e1101

Change-Id: I5544c8b5e7b79a9b8002be53a04cf0af48c7f050

6 years agoMerge "Update mGlobalBluetoothA2dpOn when active device changed" into pi-dev
Sungsoo Lim [Wed, 30 May 2018 04:39:47 +0000 (21:39 -0700)]
Merge "Update mGlobalBluetoothA2dpOn when active device changed" into pi-dev
am: babf190396

Change-Id: I7b4dba8612a8e58172d210f6f0764079cfc98af1

6 years agoMerge "Fix unwanted PIP window dismissal when moving to the bottom" into pi-dev
TreeHugger Robot [Wed, 30 May 2018 04:30:49 +0000 (04:30 +0000)]
Merge "Fix unwanted PIP window dismissal when moving to the bottom" into pi-dev

6 years ago[automerger skipped] Merge "Add default phone/sms to battery whitelist apps." into...
Fan Zhang [Wed, 30 May 2018 03:44:46 +0000 (20:44 -0700)]
[automerger skipped] Merge "Add default phone/sms to battery whitelist apps." into pi-dev am: 89722d829e
am: 32cb24c5c9  -s ours

Change-Id: I5017028520f91b1dea4aa6629d5066c1f5e0f895

6 years ago[automerger skipped] Fix bad type for txPower in PeriodicAdvertisingReport serializat...
Jakub Pawlowski [Wed, 30 May 2018 03:39:05 +0000 (20:39 -0700)]
[automerger skipped] Fix bad type for txPower in PeriodicAdvertisingReport serialization am: 459888be84 am: bc45dc9536  -s ours am: 2d6209f71d  -s ours am: e6cbbd4994  -s ours
am: 622c4b7b5d  -s ours

Change-Id: Iccc5baea262a40ace49366b038a0db28a6152559

6 years agoMerge "Build java.obex with java_sdk_library" am: ad769993a9 am: efb4ce221e
Sundong Ahn [Wed, 30 May 2018 03:31:41 +0000 (20:31 -0700)]
Merge "Build java.obex with java_sdk_library" am: ad769993a9 am: efb4ce221e
am: 1d0038a843

Change-Id: Ie696bfe2d978f7078f1051e3320c183f69a65556

6 years agoMerge "Update mGlobalBluetoothA2dpOn when active device changed" into pi-dev
TreeHugger Robot [Wed, 30 May 2018 03:26:22 +0000 (03:26 +0000)]
Merge "Update mGlobalBluetoothA2dpOn when active device changed" into pi-dev

6 years agoMerge "Do not request focus during wake and unlock" into pi-dev am: 58fc12e8fa
Lucas Dupin [Wed, 30 May 2018 03:25:38 +0000 (20:25 -0700)]
Merge "Do not request focus during wake and unlock" into pi-dev am: 58fc12e8fa
am: 668642b945

Change-Id: I9d87436cb157322f1fa02cdb00d6f4071ca0fae9

6 years agoMerge "Add default phone/sms to battery whitelist apps." into pi-dev
Fan Zhang [Wed, 30 May 2018 03:20:08 +0000 (20:20 -0700)]
Merge "Add default phone/sms to battery whitelist apps." into pi-dev
am: 89722d829e

Change-Id: Ide1af36c0e0b70d93cca44a4193f7e2a242d2de5

6 years ago[automerger skipped] Fix bad type for txPower in PeriodicAdvertisingReport serializat...
Jakub Pawlowski [Wed, 30 May 2018 03:14:57 +0000 (20:14 -0700)]
[automerger skipped] Fix bad type for txPower in PeriodicAdvertisingReport serialization am: 459888be84 am: bc45dc9536  -s ours am: 2d6209f71d  -s ours
am: e6cbbd4994  -s ours

Change-Id: I0cebfeee832964a286c6b31873368dbf90a8a6f6

6 years agoMerge "Add default phone/sms to battery whitelist apps." into pi-dev
TreeHugger Robot [Wed, 30 May 2018 03:08:19 +0000 (03:08 +0000)]
Merge "Add default phone/sms to battery whitelist apps." into pi-dev

6 years ago[automerger skipped] Fix bad type for txPower in PeriodicAdvertisingReport serializat...
Jakub Pawlowski [Wed, 30 May 2018 03:05:21 +0000 (20:05 -0700)]
[automerger skipped] Fix bad type for txPower in PeriodicAdvertisingReport serialization am: 459888be84 am: bc45dc9536  -s ours
am: 2d6209f71d  -s ours

Change-Id: I0b7af0f19142f0aa5a039de6db22f292d16c76df

6 years agoMerge "Build java.obex with java_sdk_library" am: ad769993a9
Sundong Ahn [Wed, 30 May 2018 02:54:35 +0000 (19:54 -0700)]
Merge "Build java.obex with java_sdk_library" am: ad769993a9
am: efb4ce221e

Change-Id: I31f65699193f026c7ed64a182b360791eee35608

6 years agoMerge "Do not request focus during wake and unlock" into pi-dev
Lucas Dupin [Wed, 30 May 2018 02:16:55 +0000 (19:16 -0700)]
Merge "Do not request focus during wake and unlock" into pi-dev
am: 58fc12e8fa

Change-Id: If45bd1074dc22c732074cfc59896614d4b28ab22

6 years agoMerge "Fixed an issue where the reply icon was disabled" into pi-dev am: 1c6b809579
Selim Cinek [Wed, 30 May 2018 02:13:00 +0000 (19:13 -0700)]
Merge "Fixed an issue where the reply icon was disabled" into pi-dev am: 1c6b809579
am: 684f5ffc34

Change-Id: Iba94508463ba20402b77210eaf59cee9887ea437

6 years agoMerge "Fixed the animations of Messaging Layout, leading to overlaps" into pi-dev...
Selim Cinek [Wed, 30 May 2018 02:05:58 +0000 (19:05 -0700)]
Merge "Fixed the animations of Messaging Layout, leading to overlaps" into pi-dev am: d982210d89
am: 0fc5e52023

Change-Id: I601fde5804a921a9e634e342993402d4feb8031a

6 years agoMerge "Fixed an issue where the reply icon was disabled" into pi-dev
Selim Cinek [Wed, 30 May 2018 02:04:43 +0000 (19:04 -0700)]
Merge "Fixed an issue where the reply icon was disabled" into pi-dev
am: 1c6b809579

Change-Id: Ib9593bdbf872a9146a877b3ec22c101001b2ad13

6 years agoMerge "Fixed the animations of Messaging Layout, leading to overlaps" into pi-dev
Selim Cinek [Wed, 30 May 2018 01:59:25 +0000 (18:59 -0700)]
Merge "Fixed the animations of Messaging Layout, leading to overlaps" into pi-dev
am: d982210d89

Change-Id: I4b29f82656e3b3402f89cb5d66e71955287ac0b8

6 years agoMerge "Do not request focus during wake and unlock" into pi-dev
TreeHugger Robot [Wed, 30 May 2018 01:55:18 +0000 (01:55 +0000)]
Merge "Do not request focus during wake and unlock" into pi-dev

6 years agoMerge "Add default phone/sms to battery whitelist apps."
TreeHugger Robot [Wed, 30 May 2018 01:50:40 +0000 (01:50 +0000)]
Merge "Add default phone/sms to battery whitelist apps."

6 years ago[automerger skipped] Fix bad type for txPower in PeriodicAdvertisingReport serializat...
Jakub Pawlowski [Wed, 30 May 2018 01:49:17 +0000 (18:49 -0700)]
[automerger skipped] Fix bad type for txPower in PeriodicAdvertisingReport serialization am: 459888be84
am: bc45dc9536  -s ours

Change-Id: I087f8de352c5c61db32d95ee8c47b6ab0bd171e2

6 years agoUpdate mGlobalBluetoothA2dpOn when active device changed
Sungsoo Lim [Wed, 23 May 2018 15:28:27 +0000 (00:28 +0900)]
Update mGlobalBluetoothA2dpOn when active device changed

Also do not setForceUse when a2dp config without change.

Bug: 79982460
Test: manual
Change-Id: I789b03c00366f9fd78fd3a0305fdf2c11dfc23d2

6 years agoMerge "Build java.obex with java_sdk_library"
Sundong Ahn [Wed, 30 May 2018 01:38:07 +0000 (18:38 -0700)]
Merge "Build java.obex with java_sdk_library"
am: ad769993a9

Change-Id: I3a895f10880efb9ae916376f62d059941a25e417

6 years agoMerge "Fixed an issue where the reply icon was disabled" into pi-dev
TreeHugger Robot [Wed, 30 May 2018 01:29:40 +0000 (01:29 +0000)]
Merge "Fixed an issue where the reply icon was disabled" into pi-dev

6 years agoMerge "Update call log permission group icon." into pi-dev am: 9a184cb7f3
Fan Zhang [Wed, 30 May 2018 01:04:04 +0000 (18:04 -0700)]
Merge "Update call log permission group icon." into pi-dev am: 9a184cb7f3
am: c79ed0f09f

Change-Id: I933fc06c7904778486ac63e3edc244f7083ad0dc

6 years agoMerge "Fixed the animations of Messaging Layout, leading to overlaps" into pi-dev
TreeHugger Robot [Wed, 30 May 2018 00:52:32 +0000 (00:52 +0000)]
Merge "Fixed the animations of Messaging Layout, leading to overlaps" into pi-dev

6 years agoFix bad type for txPower in PeriodicAdvertisingReport serialization
Jakub Pawlowski [Wed, 30 May 2018 00:50:07 +0000 (17:50 -0700)]
Fix bad type for txPower in PeriodicAdvertisingReport serialization
am: 459888be84

Change-Id: Ibccfb97e0b41a9ef6af9fcb1da23870dbff7f9b9

6 years agoCancel dark animation when new one arrives
Lucas Dupin [Wed, 30 May 2018 00:26:35 +0000 (17:26 -0700)]
Cancel dark animation when new one arrives

Not doing so causes weird artifacts when power button is pressed
multiple times in a row and StackScroller would have the wrong
state if unlocked with fingerprint while animation is still running.

Test: lock from lock screen, fp before animation ends
Test: press power multiple times on lock screen, look at smooth animation
Change-Id: I381bf367533983595cd22ff080f51465f6c0f750
Fixes: 79747888

6 years agoMerge "Build java.obex with java_sdk_library"
Treehugger Robot [Wed, 30 May 2018 00:20:36 +0000 (00:20 +0000)]
Merge "Build java.obex with java_sdk_library"

6 years agoBuild java.obex with java_sdk_library
Sundong Ahn [Fri, 18 May 2018 00:58:11 +0000 (09:58 +0900)]
Build java.obex with java_sdk_library

javax.obex is built with java_sdk_library and api files are added by
running "make update-api".
Remove java.obex is from platform.xml, since it will be generated
automatically by soong when the library is built with java_sdk_library.

Bug:77577799
Test: make -j
      make checkapi

Change-Id: Ib94955e62582ffbdfc7eb88cd0e494c61757c7aa

6 years agoFixed an issue where the reply icon was disabled
Selim Cinek [Wed, 30 May 2018 00:01:05 +0000 (17:01 -0700)]
Fixed an issue where the reply icon was disabled

Because it was disabled by an earlier update, a subsequent update
needs to enable the reply icon again, as the pending intent
might be valid again.

Change-Id: Ic562b399184e37c3870e1da7dc5d15baca43dc54
Fixes: 80250615
Test: add multiple messages where each one cancels the previous pendinging intent, observe clickable reply icon

6 years agoFix unwanted PIP window dismissal when moving to the bottom
Tracy Zhou [Tue, 29 May 2018 22:36:16 +0000 (15:36 -0700)]
Fix unwanted PIP window dismissal when moving to the bottom

Display#getSize() returns screen size excluding certain system decor
elements. We should get a more accurate size using Display#getRealSize()
minus bottom inset instead for calculating whether the PIP window
should be dismissed.

Fixes: 80367557
Test: atest CtsActivityManagerDeviceTestCases:ActivityManagerPinnedStackTests and manual test
Change-Id: I20cd8ccfa53bd7cc1cb7176280a01dbcb64b5745

6 years agoMerge "Update call log permission group icon." into pi-dev
Fan Zhang [Tue, 29 May 2018 23:41:36 +0000 (16:41 -0700)]
Merge "Update call log permission group icon." into pi-dev
am: 9a184cb7f3

Change-Id: I4d8ce9671c310e8b6c5b7ca94dd341dba8c2c449

6 years agoMerge changes I03b8b712,I62688119
TreeHugger Robot [Tue, 29 May 2018 23:38:57 +0000 (23:38 +0000)]
Merge changes I03b8b712,I62688119

* changes:
  Fix assertion failure in TaskPositionerTest
  Fix NPE in TaskPositionerTest

6 years agoMerge "Update call log permission group icon." into pi-dev
TreeHugger Robot [Tue, 29 May 2018 23:23:18 +0000 (23:23 +0000)]
Merge "Update call log permission group icon." into pi-dev

6 years agoAllow for any default vibration intensity level.
Michael Wright [Fri, 25 May 2018 14:13:36 +0000 (15:13 +0100)]
Allow for any default vibration intensity level.

Because we can't always create the range of effects we'd like, we may
need different default intensity levels for different devices. This
works fine for prebaked effects, but for application defined amplitudes
we need to provide a scaling function. In addition, this scaling
function should leave amplitude values untouched in the default state so
that application developers produce the effects they expect.

Bug: 80275800
Test: manual
Merged-In: Ibb552ddfa60891853ebcb1a5567ed6745bb5defe
Change-Id: Ibb552ddfa60891853ebcb1a5567ed6745bb5defe

6 years agoMerge "Disable battery saver tron log by default" into pi-dev am: dfb99b257b
Makoto Onuki [Tue, 29 May 2018 23:14:42 +0000 (16:14 -0700)]
Merge "Disable battery saver tron log by default" into pi-dev am: dfb99b257b
am: 8d4dbded5c

Change-Id: Ie869029e5178517f4b71a981c57334d5f9ea1b13

6 years agoGuard pre-O apps from malicious startForegroundService() am: 0a82690868
Christopher Tate [Tue, 29 May 2018 23:09:46 +0000 (16:09 -0700)]
Guard pre-O apps from malicious startForegroundService() am: 0a82690868
am: 33369bbd2a

Change-Id: I074b6274b98cf233b3fe9bf97807e727e38ad4bb

6 years agoMerge "Extend startForegroundService() fg transition timeout to 10 seconds" into...
Christopher Tate [Tue, 29 May 2018 23:05:50 +0000 (16:05 -0700)]
Merge "Extend startForegroundService() fg transition timeout to 10 seconds" into pi-dev am: 3ec17d31c5
am: 96efd907c5

Change-Id: I3d2ddef0b5add85130daeadc88bb907661c8d210

6 years agoMerge "Remove downgrade check for targetSandboxLevel" into pi-dev am: d55f0108c5
Chad Brubaker [Tue, 29 May 2018 23:00:13 +0000 (16:00 -0700)]
Merge "Remove downgrade check for targetSandboxLevel" into pi-dev am: d55f0108c5
am: bd14364a06

Change-Id: Ia686f4d2c08e542a30af8e999bf4f43551bef815

6 years agoDo not request focus during wake and unlock
Lucas Dupin [Tue, 29 May 2018 22:41:03 +0000 (15:41 -0700)]
Do not request focus during wake and unlock

Focus was being required because the expansion of the panel
would trigger onFullyShown. Bouncer shouldn't need any
translation during WAKE_AND_UNLOCK.

Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java
Test: go/sysui-bouncer-tests
Change-Id: I6d5c17ba89e14384859cf7fc91ca5cc2815dbfd9
Fixes: 80345339

6 years agoFix bad type for txPower in PeriodicAdvertisingReport serialization
Jakub Pawlowski [Fri, 8 Dec 2017 06:56:03 +0000 (22:56 -0800)]
Fix bad type for txPower in PeriodicAdvertisingReport serialization

Bug: 69634768
Test: compilation
Change-Id: Icedfbaf1ba933637e935ada0fd98aea42c73f2b2
Merged-In: Icedfbaf1ba933637e935ada0fd98aea42c73f2b2