OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Merge "MediaPlayer: ensure that jni code returns after throwing exceptions...
Dongwon Kang [Thu, 24 May 2018 23:08:11 +0000 (16:08 -0700)]
Merge "Merge "MediaPlayer: ensure that jni code returns after throwing exceptions." into pi-dev am: 1a9def3dc7" into pi-dev-plus-aosp
am: 42542ca0bb

Change-Id: I2c892282a2aee6b03395b1c61ebae19df8c4397c

6 years agoMerge "Merge "Remove logging from RecentsOnboarding" into pi-dev am: ee9b570dce"...
Tracy Zhou [Thu, 24 May 2018 23:02:12 +0000 (16:02 -0700)]
Merge "Merge "Remove logging from RecentsOnboarding" into pi-dev am: ee9b570dce" into pi-dev-plus-aosp
am: 42515b706f

Change-Id: Iffc4271cc094c361e38a7ff63e746f6ac3a45707

6 years agoMerge "Merge "Fix per app GPS power usage." into pi-dev am: da4c54e9da" into pi-dev...
Hui Yu [Thu, 24 May 2018 22:55:54 +0000 (15:55 -0700)]
Merge "Merge "Fix per app GPS power usage." into pi-dev am: da4c54e9da" into pi-dev-plus-aosp
am: df34735c50

Change-Id: I7ca08692d661c56cedf3548c5d557472e7b16caf

6 years agoMerge "Merge "FixBug: Round corner gone when scroll to non-first item and drag to...
Arthur Hung [Thu, 24 May 2018 21:47:23 +0000 (14:47 -0700)]
Merge "Merge "FixBug: Round corner gone when scroll to non-first item and drag to close" into pi-dev am: d732ec697e" into pi-dev-plus-aosp
am: bcc442d7bc

Change-Id: I69c0542bcac7e2370f93b3db53ad56f3d0740923

6 years agoMerge "[automerger skipped] Merge "Fixup SntpClient to bypass Private DNS" am: a7183b...
Erik Kline [Thu, 24 May 2018 21:37:15 +0000 (14:37 -0700)]
Merge "[automerger skipped] Merge "Fixup SntpClient to bypass Private DNS" am: a7183b92c4 am: 95cb9a1cb3  -s ours" into pi-dev-plus-aosp
am: 9f376da4b9  -s ours

Change-Id: I6424a73acdc4829920e864b122455d4f90776aab

6 years agoMerge "MediaCodec: make setVideoScalingMode usable for IGBP-based clients" into pi...
Lajos Molnar [Thu, 24 May 2018 21:22:49 +0000 (14:22 -0700)]
Merge "MediaCodec: make setVideoScalingMode usable for IGBP-based clients" into pi-dev am: 604064e82d
am: 226687cb4d

Change-Id: Ie4ff2a9d4a268944d96b6dbed7a0eb734cd0cd71

6 years agoMerge "Prevent onboarding counters from overflow." into pi-dev am: 0ce1cc626b
Tracy Zhou [Thu, 24 May 2018 20:54:17 +0000 (13:54 -0700)]
Merge "Prevent onboarding counters from overflow." into pi-dev am: 0ce1cc626b
am: e3cce5bf98

Change-Id: I414527e5247f64500b375e9cfc6ac103fc6cf9bd

6 years agoMerge "Store flashlight status and broadcast it needed for flashlight slice."
TreeHugger Robot [Thu, 24 May 2018 20:27:55 +0000 (20:27 +0000)]
Merge "Store flashlight status and broadcast it needed for flashlight slice."

6 years agoMerge "SystemUI theme feature flag" into pi-dev am: 3884e936c9
Lucas Dupin [Thu, 24 May 2018 19:30:35 +0000 (12:30 -0700)]
Merge "SystemUI theme feature flag" into pi-dev am: 3884e936c9
am: 2fd55ef0f3

Change-Id: I49482a8ca297b72110d8309051564bccd970b42f

6 years agoMerge "Frameworks: convert platformprotos to soong"
TreeHugger Robot [Thu, 24 May 2018 19:20:43 +0000 (19:20 +0000)]
Merge "Frameworks: convert platformprotos to soong"

6 years agoMerge "Merge "MediaPlayer: ensure that jni code returns after throwing exceptions...
Android Build Merger (Role) [Thu, 24 May 2018 18:50:26 +0000 (18:50 +0000)]
Merge "Merge "MediaPlayer: ensure that jni code returns after throwing exceptions." into pi-dev am: 1a9def3dc7" into pi-dev-plus-aosp

6 years agoMerge "MediaPlayer: ensure that jni code returns after throwing exceptions." into...
Dongwon Kang [Thu, 24 May 2018 18:50:00 +0000 (11:50 -0700)]
Merge "MediaPlayer: ensure that jni code returns after throwing exceptions." into pi-dev
am: 1a9def3dc7

Change-Id: I7ebee18631081dbd11dc54227c77d451358b8234

6 years agoMerge "Merge "Remove logging from RecentsOnboarding" into pi-dev am: ee9b570dce"...
Android Build Merger (Role) [Thu, 24 May 2018 18:45:53 +0000 (18:45 +0000)]
Merge "Merge "Remove logging from RecentsOnboarding" into pi-dev am: ee9b570dce" into pi-dev-plus-aosp

6 years agoMerge "Remove logging from RecentsOnboarding" into pi-dev
Tracy Zhou [Thu, 24 May 2018 18:45:32 +0000 (11:45 -0700)]
Merge "Remove logging from RecentsOnboarding" into pi-dev
am: ee9b570dce

Change-Id: I900357e6545ea873095cb1e29bdf21c5b60be4f0

6 years agoMerge "AAPT2: Accept density config as default"
Ryan Mitchell [Thu, 24 May 2018 18:42:22 +0000 (18:42 +0000)]
Merge "AAPT2: Accept density config as default"

6 years agoMerge "Merge "Fix per app GPS power usage." into pi-dev am: da4c54e9da" into pi-dev...
Android Build Merger (Role) [Thu, 24 May 2018 18:41:17 +0000 (18:41 +0000)]
Merge "Merge "Fix per app GPS power usage." into pi-dev am: da4c54e9da" into pi-dev-plus-aosp

6 years agoMerge "Fix per app GPS power usage." into pi-dev
Hui Yu [Thu, 24 May 2018 18:40:54 +0000 (11:40 -0700)]
Merge "Fix per app GPS power usage." into pi-dev
am: da4c54e9da

Change-Id: I16400dccbc2328548f93cf0fd285cd9be6e07351

6 years agoMerge "Remove TODO in statsd AnomalyTracker_test"
TreeHugger Robot [Thu, 24 May 2018 18:38:07 +0000 (18:38 +0000)]
Merge "Remove TODO in statsd AnomalyTracker_test"

6 years agoMerge "Merge "FixBug: Round corner gone when scroll to non-first item and drag to...
Android Build Merger (Role) [Thu, 24 May 2018 18:36:40 +0000 (18:36 +0000)]
Merge "Merge "FixBug: Round corner gone when scroll to non-first item and drag to close" into pi-dev am: d732ec697e" into pi-dev-plus-aosp

6 years agoMerge "FixBug: Round corner gone when scroll to non-first item and drag to close...
Arthur Hung [Thu, 24 May 2018 18:36:20 +0000 (11:36 -0700)]
Merge "FixBug: Round corner gone when scroll to non-first item and drag to close" into pi-dev
am: d732ec697e

Change-Id: Ibdb26abc0c52d3a3de5e80e49dee92809767d08b

6 years agoMerge "[automerger skipped] Merge "Fixup SntpClient to bypass Private DNS" am: a7183b...
Android Build Merger (Role) [Thu, 24 May 2018 18:32:50 +0000 (18:32 +0000)]
Merge "[automerger skipped] Merge "Fixup SntpClient to bypass Private DNS" am: a7183b92c4 am: 95cb9a1cb3  -s ours" into pi-dev-plus-aosp

6 years ago[automerger skipped] Merge "Fixup SntpClient to bypass Private DNS" am: a7183b92c4
Erik Kline [Thu, 24 May 2018 18:32:32 +0000 (11:32 -0700)]
[automerger skipped] Merge "Fixup SntpClient to bypass Private DNS" am: a7183b92c4
am: 95cb9a1cb3  -s ours

Change-Id: I544b4901f51e6c3038045ef8f7e838161e06ec39

6 years agoMerge "MediaCodec: make setVideoScalingMode usable for IGBP-based clients" into pi-dev
Lajos Molnar [Thu, 24 May 2018 18:31:46 +0000 (11:31 -0700)]
Merge "MediaCodec: make setVideoScalingMode usable for IGBP-based clients" into pi-dev
am: 604064e82d

Change-Id: Id6b79446fb99644b2ce346d58e38f91302d891d1

6 years agoMerge "Prevent onboarding counters from overflow." into pi-dev
Tracy Zhou [Thu, 24 May 2018 18:27:04 +0000 (11:27 -0700)]
Merge "Prevent onboarding counters from overflow." into pi-dev
am: 0ce1cc626b

Change-Id: I187b0d39be0535d108d3a17151aa5ae1314fdaeb

6 years agoMerge "SystemUI theme feature flag" into pi-dev
Lucas Dupin [Thu, 24 May 2018 18:13:58 +0000 (11:13 -0700)]
Merge "SystemUI theme feature flag" into pi-dev
am: 3884e936c9

Change-Id: Ie3ef39ec76e782f4f6893207106d2e25243af793

6 years agoMerge "Refactor for tuning gfx-max-frame-time-99" into pi-dev am: 845e89320d
Tony Huang [Thu, 24 May 2018 17:47:03 +0000 (10:47 -0700)]
Merge "Refactor for tuning gfx-max-frame-time-99" into pi-dev am: 845e89320d
am: 111dc8257f

Change-Id: I04de20030a208c9529a7035b2465df479f50358a

6 years agoStore flashlight status and broadcast it needed for flashlight slice.
Steven Wu [Thu, 24 May 2018 00:04:58 +0000 (20:04 -0400)]
Store flashlight status and broadcast it needed for flashlight slice.

Test: manual
Bug: 74913192
Change-Id: I54ead1727d08b113dec13e3f7c128895770e68f1

6 years agoMerge "Use STOCK_PM_FLAGS for backup agent" into pi-dev am: 3cc8336198
Todd Kennedy [Thu, 24 May 2018 17:41:14 +0000 (10:41 -0700)]
Merge "Use STOCK_PM_FLAGS for backup agent" into pi-dev am: 3cc8336198
am: fb13aa9cf8

Change-Id: I36f3895739b393cdf9f6473e804014ef60c08b09

6 years agoMerge "Make sure frame buffer 0 is bound before calling GL functor" into pi-dev am...
Stan Iliev [Thu, 24 May 2018 17:36:40 +0000 (10:36 -0700)]
Merge "Make sure frame buffer 0 is bound before calling GL functor" into pi-dev am: a2cc38e7fb
am: 8deb6ac7cd

Change-Id: Icc245a07ca723cce71263002a2e613f7c52f227d

6 years agoRemove TODO in statsd AnomalyTracker_test
Bookatz [Thu, 24 May 2018 17:35:02 +0000 (10:35 -0700)]
Remove TODO in statsd AnomalyTracker_test

The underlying item the TODO is referencing had already been resolved
so the test line can be properly added, per the TODO.

Change-Id: I5c16e7ea319bd16e37475381def656b38f39d17f
Fixes: 80095149
Test: make statsd_test && adb sync data && adb shell data/nativetest64/statsd_test/statsd_test

6 years agoAAPT2: Accept density config as default
Ryan Mitchell [Wed, 23 May 2018 20:31:28 +0000 (13:31 -0700)]
AAPT2: Accept density config as default

When a resource does not have a default config value defined, and the
resource only has config values defined for language translations, that
resource should be removed; however, if the resource also contains a
density specific config value, the resource should not be removed.

This is because a density specific value should have the same content as
what the default value would have, just higher or lower quality.

Bug: 76413048
Test: aapt2_tests
Change-Id: I52fe37a7aa3aefb694d3af6c8adfd6269fa26f54

6 years agoMerge "Fixup SntpClient to bypass Private DNS"
Erik Kline [Thu, 24 May 2018 14:39:50 +0000 (07:39 -0700)]
Merge "Fixup SntpClient to bypass Private DNS"
am: a7183b92c4

Change-Id: I51e0e71f81307c38599c4bbac385ebafeb9f441f

6 years agoMerge "Add getCurrentTransportComponent() API"
TreeHugger Robot [Thu, 24 May 2018 13:13:18 +0000 (13:13 +0000)]
Merge "Add getCurrentTransportComponent() API"

6 years agoMerge "Fixup SntpClient to bypass Private DNS"
Treehugger Robot [Thu, 24 May 2018 07:07:15 +0000 (07:07 +0000)]
Merge "Fixup SntpClient to bypass Private DNS"

6 years agoFixup SntpClient to bypass Private DNS
Erik Kline [Tue, 22 May 2018 12:15:49 +0000 (21:15 +0900)]
Fixup SntpClient to bypass Private DNS

NTP may be necessary in order to validate Private DNS certificates,
so it should be allowed to bypass Private DNS.

Test: as follows
    - built, flashed, booted
    - tcpdump for port 53; adb shell am restart
      queries for the NTP hostname appear in the clear
    - runtest frameworks-net passes
Bug: 64133961
Bug: 80118648
Merged-In: I4655e3ce5691098c73bf070b8a9e4759485bb17a
Merged-In: I327b816a9f472e94328232157a3b8887d17b0baf
Change-Id: Id9ceb3fcaaffb48cbbd4cd381d48cae991572c9e
(cherry picked from commit 7eccfeb9ca60aa6e09afbdf3a4435cb2f0d12987)

6 years agoMerge "Add FLAG_ACTIVITY_CLEAR_TOP to more details intent" into pi-dev am: 261a101ac2
Petr Cermak [Thu, 24 May 2018 02:38:34 +0000 (19:38 -0700)]
Merge "Add FLAG_ACTIVITY_CLEAR_TOP to more details intent" into pi-dev am: 261a101ac2
am: 801f05120f

Change-Id: I1db7aaedd3267ccaaf150388503347d55b71178b

6 years ago[automerger skipped] Merge "DO NOT MERGE Allow cross user usage event queries" into...
Julia Reynolds [Thu, 24 May 2018 02:32:24 +0000 (19:32 -0700)]
[automerger skipped] Merge "DO NOT MERGE Allow cross user usage event queries" into pi-dev am: 452936192f
am: 313c1f04cf  -s ours

Change-Id: I2180c4e6df284718fcf41765735c54412d826d29

6 years agoMerge "Proto change for new RSSI poll metric" into pi-dev am: 9f402f41e2
Oscar Shu [Thu, 24 May 2018 02:29:23 +0000 (19:29 -0700)]
Merge "Proto change for new RSSI poll metric" into pi-dev am: 9f402f41e2
am: 39fd73a9a5

Change-Id: Ib7f23508d6e36b762f2d2c8b8d814365f2beea50

6 years agoMerge "Write UsageEvents Parcel data as a Blob" into pi-dev am: 615f8039af
Michael Wachenschwanz [Thu, 24 May 2018 02:23:45 +0000 (19:23 -0700)]
Merge "Write UsageEvents Parcel data as a Blob" into pi-dev am: 615f8039af
am: 75957f43bc

Change-Id: I7670bcb9764897cfb833c20d0e0bd7be5444e98a

6 years ago[automerger skipped] Merge "DO NOT MERGE Fix bug when pressing the add user cancel...
Aarthi Balachander [Thu, 24 May 2018 02:18:14 +0000 (19:18 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix bug when pressing the add user cancel button results in a black screen Test: Tested on Mojave Bug: 80187163 Change-Id: Ie46c228dea9de71b97a276f7e4f2d60fe98649b6" into pi-dev am: 4a0371bb88
am: c433cccd84  -s ours

Change-Id: I1dc70b48e0307b993e406115975689b75f66fc92

6 years agoMerge "Only animate when the slice is actually animating" into pi-dev am: 3116918bf0
Lucas Dupin [Thu, 24 May 2018 02:16:52 +0000 (19:16 -0700)]
Merge "Only animate when the slice is actually animating" into pi-dev am: 3116918bf0
am: 5bf2a5de6f

Change-Id: I5247d66f300187728af4b0d6dbd837a021733794

6 years agoMerge "Add new hardware reliability actions and fields" into pi-dev am: f021d88cd8
Andrew Chant [Thu, 24 May 2018 02:11:05 +0000 (19:11 -0700)]
Merge "Add new hardware reliability actions and fields" into pi-dev am: f021d88cd8
am: 4846400e95

Change-Id: I0300153f8e2be526d780604bca2fded4b9705b73

6 years agoMerge "Populate mPackages with system pkg even if installed is better" into pi-dev...
Patrick Baumann [Thu, 24 May 2018 02:05:37 +0000 (19:05 -0700)]
Merge "Populate mPackages with system pkg even if installed is better" into pi-dev am: 28ea454824
am: 0e8a46e41c

Change-Id: Idf8b18ec60d4eed489ebb9e5a909cbb1d1564f89

6 years agoMerge "Whitelist ResolveActivity for explicit instant intents" into pi-dev am: bf67b4ede0
Patrick Baumann [Thu, 24 May 2018 02:00:10 +0000 (19:00 -0700)]
Merge "Whitelist ResolveActivity for explicit instant intents" into pi-dev am: bf67b4ede0
am: c3cf767237

Change-Id: Ia1720ab625837f33cb3789f013f644c63564d07c

6 years agoMerge "MediaPlayer: ensure that jni code returns after throwing exceptions." into...
TreeHugger Robot [Thu, 24 May 2018 01:59:09 +0000 (01:59 +0000)]
Merge "MediaPlayer: ensure that jni code returns after throwing exceptions." into pi-dev

6 years agoMerge "Refactor for tuning gfx-max-frame-time-99" into pi-dev
Tony Huang [Thu, 24 May 2018 01:58:47 +0000 (18:58 -0700)]
Merge "Refactor for tuning gfx-max-frame-time-99" into pi-dev
am: 845e89320d

Change-Id: I8db023e3773ef11eca21d4e1b1aff9dc30293f1d

6 years agoMerge "Initialize color mode if set" into pi-dev am: 5cb4117353
Christine Franks [Thu, 24 May 2018 01:54:51 +0000 (18:54 -0700)]
Merge "Initialize color mode if set" into pi-dev am: 5cb4117353
am: 08fa42f6d0

Change-Id: Ia3da8eb5b4da67595054a57e44363c345c142336

6 years agoMerge "Dismiss system-windows when opening assistant via voice." into pi-dev am:...
Rob Carr [Thu, 24 May 2018 01:49:28 +0000 (18:49 -0700)]
Merge "Dismiss system-windows when opening assistant via voice." into pi-dev am: a536869cfe
am: a121b7335b

Change-Id: Ic5b3b7bc38b13e86a342df3788b5c0a0630ec70d

6 years agoMerge "Use STOCK_PM_FLAGS for backup agent" into pi-dev
Todd Kennedy [Thu, 24 May 2018 01:47:29 +0000 (18:47 -0700)]
Merge "Use STOCK_PM_FLAGS for backup agent" into pi-dev
am: 3cc8336198

Change-Id: I1db6dc526e31d7b579cdd49a466ff6fea35d1e0f

6 years agoMerge "Merge "Add field to set A2DP device volume on connect (1/2)" into pi-dev am...
Android Build Merger (Role) [Thu, 24 May 2018 01:44:28 +0000 (01:44 +0000)]
Merge "Merge "Add field to set A2DP device volume on connect (1/2)" into pi-dev am: d8e8126abe am: 695cc44f56"

6 years agoMerge "Add field to set A2DP device volume on connect (1/2)" into pi-dev am: d8e8126abe
Ajay Panicker [Thu, 24 May 2018 01:41:51 +0000 (18:41 -0700)]
Merge "Add field to set A2DP device volume on connect (1/2)" into pi-dev am: d8e8126abe
am: 695cc44f56

Change-Id: Ideb1172fb7f705945a3ec81af36b7281217e529c

6 years agoMerge "Zero initialize audio_port_config and containing structs"
TreeHugger Robot [Thu, 24 May 2018 01:39:41 +0000 (01:39 +0000)]
Merge "Zero initialize audio_port_config and containing structs"

6 years agoMerge "Make sure frame buffer 0 is bound before calling GL functor" into pi-dev
Stan Iliev [Thu, 24 May 2018 01:36:42 +0000 (18:36 -0700)]
Merge "Make sure frame buffer 0 is bound before calling GL functor" into pi-dev
am: a2cc38e7fb

Change-Id: Iedbd9549e754bb2884f447e3d964b9601e9161e5

6 years agoMerge "Wicked good battery saver + rotation icons!" into pi-dev am: f354ba185a
Evan Laird [Thu, 24 May 2018 01:36:26 +0000 (18:36 -0700)]
Merge "Wicked good battery saver + rotation icons!" into pi-dev am: f354ba185a
am: 50b1e2c1eb

Change-Id: Ic8ecba6bb05059ea1eec7ed55ef9b96eb83b465d

6 years agoMerge "Remove logging from RecentsOnboarding" into pi-dev
TreeHugger Robot [Thu, 24 May 2018 01:35:31 +0000 (01:35 +0000)]
Merge "Remove logging from RecentsOnboarding" into pi-dev

6 years agoMerge "Use CaptivePortalProbeSpec method in portal app" into pi-dev am: 9a963e1137
Chalard Jean [Thu, 24 May 2018 01:31:05 +0000 (18:31 -0700)]
Merge "Use CaptivePortalProbeSpec method in portal app" into pi-dev am: 9a963e1137
am: 95ea872e20

Change-Id: I851d8c41d42dccb03f813e549439f44c83f7d5ac

6 years agoMerge "Replace nav bar assets from png to vector drawables (1/2)" into pi-dev am...
Winson Chung [Thu, 24 May 2018 01:25:21 +0000 (18:25 -0700)]
Merge "Replace nav bar assets from png to vector drawables (1/2)" into pi-dev am: 98cb40cf4b
am: a6b326b91f

Change-Id: Ida93a11bada02df266352e47cdbc35fded5d6ce5

6 years agoMerge "Fix: ConnectivityManager is initialized with a wrong context" into pi-dev...
Chalard Jean [Thu, 24 May 2018 01:19:53 +0000 (18:19 -0700)]
Merge "Fix: ConnectivityManager is initialized with a wrong context" into pi-dev am: ccf93b2792
am: 04a4425729

Change-Id: I03a6c8ec52a5aa4fd7620d18f7cf75fa115be73b

6 years agoMerge "Make the clock font a little thicker" into pi-dev am: e28c42f785
Lucas Dupin [Thu, 24 May 2018 01:14:28 +0000 (18:14 -0700)]
Merge "Make the clock font a little thicker" into pi-dev am: e28c42f785
am: a24b66b990

Change-Id: Iec3802568b97cb49d187b5427779adcb138c840a

6 years agoMerge "Add FLAG_ACTIVITY_CLEAR_TOP to more details intent" into pi-dev
Petr Cermak [Thu, 24 May 2018 01:05:08 +0000 (18:05 -0700)]
Merge "Add FLAG_ACTIVITY_CLEAR_TOP to more details intent" into pi-dev
am: 261a101ac2

Change-Id: I5835d0d534859253aaa1927a4e8a0cf9a4d5aaea

6 years agoMerge "Make "am set-standby-bucket" reset active/working left time" into pi-dev am...
Makoto Onuki [Thu, 24 May 2018 01:04:06 +0000 (18:04 -0700)]
Merge "Make "am set-standby-bucket" reset active/working left time" into pi-dev am: fab8e71697
am: 21502685fc

Change-Id: I3b7038798ca66b062cdc1e3b0e763a90edd31c54

6 years agoMerge "Handle managed profile with unified challenge in getHashFactor()" into pi...
Rubin Xu [Thu, 24 May 2018 00:58:39 +0000 (17:58 -0700)]
Merge "Handle managed profile with unified challenge in getHashFactor()" into pi-dev am: b2b69629b6
am: 7b9475b2d2

Change-Id: Ib9583b2a208fcd0b44d96a8cfea070bd89fbaa82

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 481f84...
Bill Yi [Thu, 24 May 2018 00:53:10 +0000 (17:53 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 481f8468c0  -s ours
am: d460cc4963  -s ours

Change-Id: I0d0514a010d45ac6715d2b3fbe175291d4d73a29

6 years agoMerge "DO NOT MERGE Allow cross user usage event queries" into pi-dev
Julia Reynolds [Thu, 24 May 2018 00:51:11 +0000 (17:51 -0700)]
Merge "DO NOT MERGE Allow cross user usage event queries" into pi-dev
am: 452936192f

Change-Id: Ied4b55365157a03f9bcc15166b330ceb2e62530c

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: f5bc92...
Bill Yi [Thu, 24 May 2018 00:51:01 +0000 (17:51 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: f5bc92d971  -s ours
am: 32021773f1  -s ours

Change-Id: I2d2a7934500b2162d3a5aaa11b75d6ef98d6401e

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: c661e6...
Bill Yi [Thu, 24 May 2018 00:49:42 +0000 (17:49 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: c661e659f7  -s ours
am: 9a34ca4483  -s ours

Change-Id: Icd099d9f43a84b36e46b6febcd88998b9f6bf573

6 years agoMerge "Fix crash when creating overview proxy service from background thread" into...
Winson Chung [Thu, 24 May 2018 00:48:22 +0000 (17:48 -0700)]
Merge "Fix crash when creating overview proxy service from background thread" into pi-dev am: e924341dc5
am: 53675dbd52

Change-Id: I11c9c0238855f9ec596fd0320c9b6fef0e3c9ed1

6 years agoMerge "Proto change for new RSSI poll metric" into pi-dev
Oscar Shu [Thu, 24 May 2018 00:43:17 +0000 (17:43 -0700)]
Merge "Proto change for new RSSI poll metric" into pi-dev
am: 9f402f41e2

Change-Id: I4131c892c9aab746b846cbed5093bdd4034ad034

6 years agoMerge "Last-ditch clamping of negative NetworkStats." into pi-dev am: 44eae19b24
Jeff Sharkey [Thu, 24 May 2018 00:43:05 +0000 (17:43 -0700)]
Merge "Last-ditch clamping of negative NetworkStats." into pi-dev am: 44eae19b24
am: 08211d9479

Change-Id: I572ef538dafb59d8947958df8eac155e890d08f0

6 years agoMerge "Write UsageEvents Parcel data as a Blob" into pi-dev
Michael Wachenschwanz [Thu, 24 May 2018 00:38:41 +0000 (17:38 -0700)]
Merge "Write UsageEvents Parcel data as a Blob" into pi-dev
am: 615f8039af

Change-Id: I7e7f663d3eae14630cc5f2b357ead02c4875d19a

6 years agoMediaPlayer: ensure that jni code returns after throwing exceptions.
Dongwon Kang [Thu, 24 May 2018 00:38:35 +0000 (17:38 -0700)]
MediaPlayer: ensure that jni code returns after throwing exceptions.

Test: no crash on getPlaybackParams and pass post media CTS
Bug: 80200877
Change-Id: I7538967962acc2a23062615c0d39720b34505f17

6 years agoMerge "Send broadcast to verifier" into pi-dev am: 7d386fb5d7
Todd Kennedy [Thu, 24 May 2018 00:37:39 +0000 (17:37 -0700)]
Merge "Send broadcast to verifier" into pi-dev am: 7d386fb5d7
am: a898ee826e

Change-Id: Ie8af447c849151b237302a76b6a3c1c3b968167a

6 years agoMerge "DO NOT MERGE Fix bug when pressing the add user cancel button results in a...
Aarthi Balachander [Thu, 24 May 2018 00:34:15 +0000 (17:34 -0700)]
Merge "DO NOT MERGE Fix bug when pressing the add user cancel button results in a black screen Test: Tested on Mojave Bug: 80187163 Change-Id: Ie46c228dea9de71b97a276f7e4f2d60fe98649b6" into pi-dev
am: 4a0371bb88

Change-Id: I4bd8bdc43acd456120335992c2d334f380022d82

6 years agoMerge "Avoid race condition when broadcasting device list changed." into pi-dev am...
jiabin [Thu, 24 May 2018 00:32:29 +0000 (17:32 -0700)]
Merge "Avoid race condition when broadcasting device list changed." into pi-dev am: 2914820ebf
am: ce48867cf9

Change-Id: I6a5962aec5d3a632547ec20bd06b9c05cd2979fb

6 years agoMerge "Only animate when the slice is actually animating" into pi-dev
Lucas Dupin [Thu, 24 May 2018 00:30:56 +0000 (17:30 -0700)]
Merge "Only animate when the slice is actually animating" into pi-dev
am: 3116918bf0

Change-Id: Ibd2b6744b42fdf503fc31cbe616fc2b2f15e5f88

6 years agoMerge "Avoid NPE in AM.getMyMemoryState()" into pi-dev am: 29c5266d28
Makoto Onuki [Thu, 24 May 2018 00:26:40 +0000 (17:26 -0700)]
Merge "Avoid NPE in AM.getMyMemoryState()" into pi-dev am: 29c5266d28
am: 346c55bdd8

Change-Id: Iadde2839fc6b2cb2dbc573e2252b72cc393c7732

6 years agoMerge "Add new hardware reliability actions and fields" into pi-dev
Andrew Chant [Thu, 24 May 2018 00:26:27 +0000 (17:26 -0700)]
Merge "Add new hardware reliability actions and fields" into pi-dev
am: f021d88cd8

Change-Id: Ic84deec5f0277e1ff2db8ff08f75c79d605f8bbe

6 years agoMerge "Fix per app GPS power usage." into pi-dev
TreeHugger Robot [Thu, 24 May 2018 00:22:22 +0000 (00:22 +0000)]
Merge "Fix per app GPS power usage." into pi-dev

6 years agoMerge "Populate mPackages with system pkg even if installed is better" into pi-dev
Patrick Baumann [Thu, 24 May 2018 00:21:48 +0000 (17:21 -0700)]
Merge "Populate mPackages with system pkg even if installed is better" into pi-dev
am: 28ea454824

Change-Id: I92b2320ac2d1fdb4fabe03af47688d87dac10eba

6 years agoMerge "On orientation change, update rounded corners" into pi-dev am: 4524e93577
Beverly [Thu, 24 May 2018 00:21:10 +0000 (17:21 -0700)]
Merge "On orientation change, update rounded corners" into pi-dev am: 4524e93577
am: 539f693086

Change-Id: I2cb3fff4f5ee3c4e8fc3d4f47cd3957a6ca7c3e3

6 years agoMerge "Whitelist ResolveActivity for explicit instant intents" into pi-dev
Patrick Baumann [Thu, 24 May 2018 00:17:22 +0000 (17:17 -0700)]
Merge "Whitelist ResolveActivity for explicit instant intents" into pi-dev
am: bf67b4ede0

Change-Id: I1bb72507f7d4b2e713cc3084217cba025ffaebf6

6 years agoMerge "Add configurable captive portal probes" into pi-dev am: 1f8f21af60
Remi NGUYEN VAN [Thu, 24 May 2018 00:15:44 +0000 (17:15 -0700)]
Merge "Add configurable captive portal probes" into pi-dev am: 1f8f21af60
am: 23d3487caa

Change-Id: Ia958815325d1466345e9626efc8f62fc9d08d774

6 years agoMerge "Initialize color mode if set" into pi-dev
Christine Franks [Thu, 24 May 2018 00:12:57 +0000 (17:12 -0700)]
Merge "Initialize color mode if set" into pi-dev
am: 5cb4117353

Change-Id: I136cd337d23c60465b18b4162ad4cdd7e6fc8652

6 years agoZero initialize audio_port_config and containing structs
Mikhail Naganov [Wed, 23 May 2018 23:54:12 +0000 (16:54 -0700)]
Zero initialize audio_port_config and containing structs

Add zero initialization for struct audio_port_config and
the structures that contain it: audio_port and audio_patch.

Left intact places where the struct is overwritten completely
or memset'd right after declaration.

Test: make
Change-Id: I30c9eb8822f35a394dd49ea0891430b539d0e81e

6 years agoMerge "WM: Prevent secondary display focus while keyguard is up" into pi-dev am:...
Adrian Roos [Thu, 24 May 2018 00:10:24 +0000 (17:10 -0700)]
Merge "WM: Prevent secondary display focus while keyguard is up" into pi-dev am: c8494ab0d7
am: 8c4a97a2f8

Change-Id: I88068eef2e15363648a4d3026ad493ab3d089fc9

6 years agoMerge "Dismiss system-windows when opening assistant via voice." into pi-dev
Rob Carr [Thu, 24 May 2018 00:08:28 +0000 (17:08 -0700)]
Merge "Dismiss system-windows when opening assistant via voice." into pi-dev
am: a536869cfe

Change-Id: If79a858967a41205a5b2090aa8a1f9583417d23e

6 years agoMerge "Add field to set A2DP device volume on connect (1/2)" into pi-dev
Ajay Panicker [Thu, 24 May 2018 00:03:07 +0000 (17:03 -0700)]
Merge "Add field to set A2DP device volume on connect (1/2)" into pi-dev
am: d8e8126abe

Change-Id: Iefd55728bd7b2a22944de775a2dd24124bfa2bb0

6 years agoMerge "FixBug: Round corner gone when scroll to non-first item and drag to close...
TreeHugger Robot [Thu, 24 May 2018 00:00:51 +0000 (00:00 +0000)]
Merge "FixBug: Round corner gone when scroll to non-first item and drag to close" into pi-dev

6 years agoMerge "Wicked good battery saver + rotation icons!" into pi-dev
Evan Laird [Wed, 23 May 2018 23:58:34 +0000 (16:58 -0700)]
Merge "Wicked good battery saver + rotation icons!" into pi-dev
am: f354ba185a

Change-Id: I7936cfc374390bfde381759c6265b786d86e4248

6 years agoMerge "Use CaptivePortalProbeSpec method in portal app" into pi-dev
Chalard Jean [Wed, 23 May 2018 23:54:08 +0000 (16:54 -0700)]
Merge "Use CaptivePortalProbeSpec method in portal app" into pi-dev
am: 9a963e1137

Change-Id: Iebd307b5d73a7b4679baea2a1c12c3baba6a7447

6 years ago[automerger skipped] Merge "Update hidden API lists in AOSP" am: ddceca858f am: a320e...
David Brazdil [Wed, 23 May 2018 23:50:52 +0000 (16:50 -0700)]
[automerger skipped] Merge "Update hidden API lists in AOSP" am: ddceca858f am: a320e97d42  -s ours
am: eebf7652f8  -s ours

Change-Id: I1095671d9f9846daeb4e5f3f1fd047f88aa7ef60

6 years agoMerge "Replace nav bar assets from png to vector drawables (1/2)" into pi-dev
Winson Chung [Wed, 23 May 2018 23:49:22 +0000 (16:49 -0700)]
Merge "Replace nav bar assets from png to vector drawables (1/2)" into pi-dev
am: 98cb40cf4b

Change-Id: I4f257067437e26f75a5614c65b6f4ce8c2cf615f

6 years agoMerge "Fix: ConnectivityManager is initialized with a wrong context" into pi-dev
Chalard Jean [Wed, 23 May 2018 23:44:47 +0000 (16:44 -0700)]
Merge "Fix: ConnectivityManager is initialized with a wrong context" into pi-dev
am: ccf93b2792

Change-Id: Ib8815f010883cdb94fcad2cdfb237de39327b20a

6 years agoMerge "Change notification interruption calculation" into pi-dev am: 65d21a4db7
Julia Reynolds [Wed, 23 May 2018 23:41:38 +0000 (16:41 -0700)]
Merge "Change notification interruption calculation" into pi-dev am: 65d21a4db7
am: 04be237fd2

Change-Id: Id5694666224579aec371600b7254b2d463a9eefe

6 years agoMerge "MediaCodec: make setVideoScalingMode usable for IGBP-based clients" into pi-dev
Lajos Molnar [Wed, 23 May 2018 23:41:21 +0000 (23:41 +0000)]
Merge "MediaCodec: make setVideoScalingMode usable for IGBP-based clients" into pi-dev

6 years agoMerge "Make the clock font a little thicker" into pi-dev
Lucas Dupin [Wed, 23 May 2018 23:40:09 +0000 (16:40 -0700)]
Merge "Make the clock font a little thicker" into pi-dev
am: e28c42f785

Change-Id: I80dd4454207c0322828f8fa9362369ab396eed9d

6 years agoMerge "Prevent onboarding counters from overflow." into pi-dev
TreeHugger Robot [Wed, 23 May 2018 23:37:37 +0000 (23:37 +0000)]
Merge "Prevent onboarding counters from overflow." into pi-dev

6 years agoMerge "Make "am set-standby-bucket" reset active/working left time" into pi-dev
Makoto Onuki [Wed, 23 May 2018 23:35:32 +0000 (16:35 -0700)]
Merge "Make "am set-standby-bucket" reset active/working left time" into pi-dev
am: fab8e71697

Change-Id: Iac991dcc15b9e5c506e48c9072a4704aeaaad04e

6 years ago[automerger skipped] Merge "Remove Arrays.checkOffsetAndCount from the greylist....
Pete Gillin [Wed, 23 May 2018 23:32:42 +0000 (16:32 -0700)]
[automerger skipped] Merge "Remove Arrays.checkOffsetAndCount from the greylist." am: 0040a61c3e am: 9864d427cd
am: a4b5b6dcfc  -s ours

Change-Id: Ib660598c6b3b43fbd9121954706a680e09a85dfa

6 years agoMerge "Handle managed profile with unified challenge in getHashFactor()" into pi-dev
Rubin Xu [Wed, 23 May 2018 23:30:55 +0000 (16:30 -0700)]
Merge "Handle managed profile with unified challenge in getHashFactor()" into pi-dev
am: b2b69629b6

Change-Id: I07fe6a89c872a93b32b82b098270772a80ef4f06