OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev am...
Bill Yi [Fri, 6 Jul 2018 03:57:24 +0000 (20:57 -0700)]
Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev am: ec4d649d8f am: f051b28554
am: 5d61a6618b

Change-Id: I0eeeb695d9125b05d136700b3e03157c25a302fc

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped...
Bill Yi [Fri, 6 Jul 2018 03:48:58 +0000 (20:48 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc am: 9204ce40e4  -s ours am: e45b804b65  -s ours
am: d9d9d1daca  -s ours

Change-Id: Id13c67950da4a13f9035c0e35b903237948f61a5

6 years agoMerge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev am...
Bill Yi [Fri, 6 Jul 2018 03:23:45 +0000 (20:23 -0700)]
Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev am: ec4d649d8f
am: f051b28554

Change-Id: Ia57f2327964435888de185ed3cd461f6299daa62

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped...
Bill Yi [Fri, 6 Jul 2018 03:16:48 +0000 (20:16 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc am: 9204ce40e4  -s ours
am: e45b804b65  -s ours

Change-Id: Iae41c56e1a5007b66a1a880d1ef5e4a351a5ca63

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped...
Bill Yi [Fri, 6 Jul 2018 03:07:47 +0000 (20:07 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab am: b3bf111bd5  -s ours am: 4065ce8773  -s ours
am: 03e1c5f227  -s ours

Change-Id: Iddcf2126b4c25970d87e3f90a66033a9a09c5ace

6 years agoMerge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev
Bill Yi [Fri, 6 Jul 2018 03:03:49 +0000 (20:03 -0700)]
Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev
am: ec4d649d8f

Change-Id: I874acb53e25065d4a9a8018f2f0e69d6d041fa8b

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped...
Bill Yi [Fri, 6 Jul 2018 03:02:41 +0000 (20:02 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab am: b3bf111bd5  -s ours
am: 4065ce8773  -s ours

Change-Id: I2f05f7f47f5e7aed365bee09afc30b019cb73993

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped...
Bill Yi [Fri, 6 Jul 2018 03:01:40 +0000 (20:01 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc
am: 9204ce40e4  -s ours

Change-Id: Ic798dfd5e7b85f7341d2c929519aa227a95e6f18

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped...
Bill Yi [Fri, 6 Jul 2018 02:57:42 +0000 (19:57 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab
am: b3bf111bd5  -s ours

Change-Id: Ice5c1a283c59a8640868cdc3a8acc4afb97e5468

6 years agoMerge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev
TreeHugger Robot [Fri, 6 Jul 2018 02:45:27 +0000 (02:45 +0000)]
Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc
  [automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6
  Import translations. DO NOT MERGE

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped...
Android Build Merger (Role) [Thu, 5 Jul 2018 21:45:40 +0000 (21:45 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc

Change-Id: I5c0a1faf8d1dc7bf5d6fc831b61ab40697a422d5

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6
Android Build Merger (Role) [Thu, 5 Jul 2018 21:45:32 +0000 (21:45 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6

Change-Id: I8ba42b65a49ff3e9c30e56dc8664bc8a942b4d25

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 5 Jul 2018 21:45:03 +0000 (14:45 -0700)]
Import translations. DO NOT MERGE

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

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped...
Android Build Merger (Role) [Thu, 5 Jul 2018 20:32:02 +0000 (20:32 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab

Change-Id: Idb16f83382ec0d792c15733b46fe31a99e89552a

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228
Android Build Merger (Role) [Thu, 5 Jul 2018 20:31:54 +0000 (20:31 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228

Change-Id: Ie556d4be250c4d6f4ade238bb905455aa0454b73

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 5 Jul 2018 20:31:17 +0000 (13:31 -0700)]
Import translations. DO NOT MERGE

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

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 4 Jul 2018 23:58:23 +0000 (16:58 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I28cf7af28a854687af1b92930a9e79e02d685c35

6 years agoMerge "DO NOT MERGE: Delay brightness change" into pi-dev
TreeHugger Robot [Wed, 4 Jul 2018 02:34:42 +0000 (02:34 +0000)]
Merge "DO NOT MERGE: Delay brightness change" into pi-dev

6 years agoDO NOT MERGE: Delay brightness change
Lucas Dupin [Mon, 2 Jul 2018 18:17:14 +0000 (11:17 -0700)]
DO NOT MERGE: Delay brightness change

During a fingerprint wake-up, the display state changes bumping up
the display brightness. This means that the screen will flash
bright if the scrims couldn't draw and blank the screen yet.

The fix updates the state of the keyguard, waits for the frame to be
pushed to the display (can take up to 2 frames since we're using
triple buffers), when then asks PowerManager to wake-up the device.

Fixes: 80415238
Test: fp unlock with AOD on and off on devices with displays from
      multiple vendors
Change-Id: I60f0e265c4af87cc1cb4fcf31e89558a330a4b71
Merged-In: I752f9bd5ffd754166ffee7dc15960909dd3f1a81

6 years agoMerge "Include annotations in metalava stubs" into pi-dev
Tor Norbye [Tue, 3 Jul 2018 23:11:25 +0000 (23:11 +0000)]
Merge "Include annotations in metalava stubs" into pi-dev

6 years agoMerge "Add active admin app to power white list." into pi-dev
TreeHugger Robot [Tue, 3 Jul 2018 20:24:58 +0000 (20:24 +0000)]
Merge "Add active admin app to power white list." into pi-dev

6 years agoMerge "Cross fade wake-up from pulsing" into pi-dev
Lucas Dupin [Tue, 3 Jul 2018 18:52:23 +0000 (18:52 +0000)]
Merge "Cross fade wake-up from pulsing" into pi-dev

6 years agoMerge "AudioService: history of A2DP commands" into pi-dev
Jean-Michel Trivi [Tue, 3 Jul 2018 18:49:33 +0000 (18:49 +0000)]
Merge "AudioService: history of A2DP commands" into pi-dev

6 years agoMerge "Add system_server to system group only if per_app_memcg is true" into pi-dev
TreeHugger Robot [Tue, 3 Jul 2018 18:39:18 +0000 (18:39 +0000)]
Merge "Add system_server to system group only if per_app_memcg is true" into pi-dev

6 years agoMerge "Correctly preserve key generation parameters" into pi-dev
TreeHugger Robot [Tue, 3 Jul 2018 18:31:06 +0000 (18:31 +0000)]
Merge "Correctly preserve key generation parameters" into pi-dev

6 years agoAudioService: history of A2DP commands
Jean-Michel Trivi [Mon, 2 Jul 2018 17:48:04 +0000 (10:48 -0700)]
AudioService: history of A2DP commands

Keep history of command coming from A2dpService in AudioService
  logger.

Bug: 110186160
Test: connect/disconnect A2DP device and take bugreport,
      or run $ adb shell dumpsys audio

Change-Id: Ice65c20e91aa2675fbacb1c326a53d5b02bba3e5

6 years agoAdd active admin app to power white list.
Lei Yu [Thu, 28 Jun 2018 21:06:29 +0000 (14:06 -0700)]
Add active admin app to power white list.

So user can't restrict it in settings app.

Bug: 110337989
Test: RunSettingsLibTests
Change-Id: Ie32dc8b2204369c9ca8f704436d5c988f76481ae
Merged-In: Ie32dc8b2204369c9ca8f704436d5c988f76481ae

6 years agoMerge "add three new carrier configs for call forwarding, Caller ID and Call Waiting...
TreeHugger Robot [Tue, 3 Jul 2018 00:01:52 +0000 (00:01 +0000)]
Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." into pi-dev

6 years agoMerge "Only use simple rects for cutout region" into pi-dev
Jorim Jaggi [Mon, 2 Jul 2018 21:35:50 +0000 (21:35 +0000)]
Merge "Only use simple rects for cutout region" into pi-dev

6 years agoInclude annotations in metalava stubs
Colin Cross [Mon, 2 Jul 2018 21:04:10 +0000 (14:04 -0700)]
Include annotations in metalava stubs

Pass --include-annotation-classes tools/metalava/stub-annotations
to metalava so that the stubs end up in the final jar.  They will be
post-processed with metalava --rewrite-annotations to avoid affecting
the public SDK.

Bug: 110532131
Test: m out/target/common/obj/JAVA_LIBRARIES/metalava_android_stubs_current_intermediates/classes.jar
Change-Id: Icb9268a72aa7de82ed6ad88aef9ac813796f9bf9
Merged-In: I116643925a3a9594e8590c3714e93d0fb0ac372f

6 years agoMerge "Move charging indication vertically on time tick" into pi-dev
TreeHugger Robot [Mon, 2 Jul 2018 18:39:55 +0000 (18:39 +0000)]
Merge "Move charging indication vertically on time tick" into pi-dev

6 years agoMove charging indication vertically on time tick
Lucas Dupin [Wed, 27 Jun 2018 18:44:57 +0000 (11:44 -0700)]
Move charging indication vertically on time tick

Before, a new translation was only calculated when the device enters
AOD, and then, during time tick, we would only move it 5px wich isn't
enough.
Now, the translation varies 5dps vertically on every time tick.

Fixes: 110888643
Test: take screenshots for N minutes and compare them
Change-Id: Ia3f239d669b83aad0d97d8d7a7f7374f4890777d
Merged-In: Ia3f239d669b83aad0d97d8d7a7f7374f4890777d

6 years agoCross fade wake-up from pulsing
Lucas Dupin [Wed, 27 Jun 2018 20:35:52 +0000 (13:35 -0700)]
Cross fade wake-up from pulsing

Activate WM animation and remove scrims when
fading keyguard from the pulsing state to prettify
animation on new devices.

Test: wake up with fp from pulsing to launcher
Test: wake up with fp from pulsing to app
Fixes: 110824274
Change-Id: I0446f26939a2e25cd50d0d39f3fc703019196f7a

6 years agoOnly use simple rects for cutout region
Jorim Jaggi [Thu, 28 Jun 2018 23:14:31 +0000 (01:14 +0200)]
Only use simple rects for cutout region

Otherwise there is a big performance hit in all kinds of
situations where we do operations with the region, specifically
when:

- updating input windows
- insetting the cutout during layout
- touch dispatch

Test: DisplayCutoutTest, WmDisplayCutoutTest
Bug: 110464019
Bug: 110452325
Change-Id: I94a25c3794ecd33b8b7204ca308ac91623498f13

6 years agoMerge "add three new carrier configs for call forwarding, Caller ID and Call Waiting...
SongFerng Wang [Sat, 30 Jun 2018 06:22:12 +0000 (06:22 +0000)]
Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." into pi-dev

6 years agoadd three new carrier configs for call forwarding, Caller ID and Call Waiting.
SongFerngWang [Thu, 28 Jun 2018 09:28:22 +0000 (17:28 +0800)]
add three new carrier configs for call forwarding, Caller ID and Call Waiting.

The carrier configs control the call forwarding and additional
settings button in the Call Settings menu and caller ID and
call waiting in additional settings menu.

Bug: 110121209
Test: manual - test case as below :
1.flag clir on and flag cw on ,do CLIR show/hide,
    and make call to other device.(PASS)
2.flag clir on and flag cw on ,do CW on/off,and CW function work.(PASS)
3.flag clir off and flag cw on ,no CLIR in additional settings page(PASS)
4.flag clir off and flag cw on ,do CW on/off,and CW function work.(PASS)
5.flag clir on and flag cw off ,do CLIR show/hide ,
    and make call to other device.(PASS)
6.flag clir on and flag cw off ,no CW in additional settings page(PASS)
7.flag clir off and flag cw off,
    no Additional Settings in call feature settings(PASS)
8.flag cf off,no cf in call settings page (PASS)

Change-Id: I29d7a71ad57b3b05ccc6025154f63119b35dab71

6 years agoAdd system_server to system group only if per_app_memcg is true
Minchan Kim [Wed, 27 Jun 2018 02:32:40 +0000 (11:32 +0900)]
Add system_server to system group only if per_app_memcg is true

P18 or other high-performance devices shouldn't use per-memcg so
it was disabled on those devices[1]. However, we didn't turn off
for system_server memcg so those devices still have two seperate
LRU groups which would have less efficient memory reclaim.

Therefore, this patch makes memcg use for system_server only if
per_app_memcg is enabled.

[1] https://googleplex-android-review.git.corp.google.com/c/platform/system/core/+/4178592

Bug: 110858093
Test: confirm via cat /dev/memcg/system/tasks is none
Change-Id: Ic0e3157bf8ff5de69767797b5508946ca3efeb68
Signed-off-by: Minchan Kim <minchan@google.com>
6 years agoadd three new carrier configs for call forwarding, Caller ID and Call Waiting.
SongFerngWang [Fri, 29 Jun 2018 07:40:20 +0000 (15:40 +0800)]
add three new carrier configs for call forwarding, Caller ID and Call Waiting.

The carrier configs control the call forwarding and additional
settings button in the Call Settings menu and caller ID and
call waiting in additional settings menu.

Bug: 110121209
Test: manual - test case as below :
1.flag clir on and flag cw on ,do CLIR show/hide,
    and make call to other device.(PASS)
2.flag clir on and flag cw on ,do CW on/off,and CW function work.(PASS)
3.flag clir off and flag cw on ,no CLIR in additional settings page(PASS)
4.flag clir off and flag cw on ,do CW on/off,and CW function work.(PASS)
5.flag clir on and flag cw off ,do CLIR show/hide ,
    and make call to other device.(PASS)
6.flag clir on and flag cw off ,no CW in additional settings page(PASS)
7.flag clir off and flag cw off,
    no Additional Settings in call feature settings(PASS)
8.flag cf off,no cf in call settings page (PASS)

Change-Id: I91a64d43e61c38ac1d744b99a2f8f03bbcf49deb

6 years agoMerge "AOD animation polish" into pi-dev
Lucas Dupin [Fri, 29 Jun 2018 18:27:46 +0000 (18:27 +0000)]
Merge "AOD animation polish" into pi-dev

6 years agoMerge "Add new carrier config for CDMA registered PLMN when not roaming." into pi-dev
TreeHugger Robot [Fri, 29 Jun 2018 17:23:13 +0000 (17:23 +0000)]
Merge "Add new carrier config for CDMA registered PLMN when not roaming." into pi-dev

6 years agoMerge "Fix in Wifi activity updates" into pi-dev
TreeHugger Robot [Thu, 28 Jun 2018 21:33:24 +0000 (21:33 +0000)]
Merge "Fix in Wifi activity updates" into pi-dev

6 years agoMerge "Force redraw after wallpaper is loaded" into pi-dev
TreeHugger Robot [Thu, 28 Jun 2018 20:01:36 +0000 (20:01 +0000)]
Merge "Force redraw after wallpaper is loaded" into pi-dev

6 years agoAOD animation polish
Lucas Dupin [Thu, 28 Jun 2018 18:09:09 +0000 (11:09 -0700)]
AOD animation polish

Change-Id: I03220e30d52aadc5aab8edddf759debd3302c95d
Fixes: 110227946
Test: visual

6 years agoMerge "Do not create highlight if track width is invalid" into pi-dev
TreeHugger Robot [Thu, 28 Jun 2018 17:25:37 +0000 (17:25 +0000)]
Merge "Do not create highlight if track width is invalid" into pi-dev

6 years agoCorrectly preserve key generation parameters
Eran Messeri [Thu, 28 Jun 2018 10:20:44 +0000 (11:20 +0100)]
Correctly preserve key generation parameters

Due to an oversight, some of the key generation parameters that are set
in KeyGenParameterSpec were not preserved when parceling the object
(they should have been added to ParcelableKeyGenParameterSpec but were
not).

This means these parameters will be ignored when generating keys using
the DevicePolicyManager.generateKeyPair method, leading to an
inconsistent key generation behaviour between the DevicePolicyManager
and KeyStore.

In particular, this would prevent callers from using StrongBox when
generating keys for use in the KeyChain.

Fix the issue by simply persisting these parameters in
ParcelableKeyGenParameterSpec and making sure that the Builder copies
them too from the source KeyGenParameterSpec.

Left to do is put in place an automated measure to find out
discrepancies between the two classes.

Bug: 110915980
Bug: 110882855
Bug: 109953656
Test: atest KeystoreTests
Change-Id: Ic64bd2921b6dfc97ea34ecba55f532312963ffcb

6 years agoMerge "Correct the keystore alias used for secure imports" into pi-dev
TreeHugger Robot [Thu, 28 Jun 2018 05:07:38 +0000 (05:07 +0000)]
Merge "Correct the keystore alias used for secure imports" into pi-dev

6 years agoMerge "P is for PAINT." into pi-dev
TreeHugger Robot [Thu, 28 Jun 2018 03:49:05 +0000 (03:49 +0000)]
Merge "P is for PAINT." into pi-dev

6 years agoMerge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into oc-dev am...
Atanas Kirilov [Thu, 28 Jun 2018 01:48:55 +0000 (18:48 -0700)]
Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into oc-dev am: 8b047ec8a2 am: 245cc0559f
am: 0f4152e815

Change-Id: I49e413e32d9db706eaa5a56fc84f9998a47b8a9e

6 years agoMerge "Backport Prevent shortcut info package name spoofing" into oc-dev am: c6dbcc13...
Atanas Kirilov [Thu, 28 Jun 2018 01:35:46 +0000 (18:35 -0700)]
Merge "Backport Prevent shortcut info package name spoofing" into oc-dev am: c6dbcc137e am: dcc95b94f8
am: ab3235ad5b

Change-Id: I1152d43ce2eec7cd5692d61df725bcd8b455aca3

6 years agoMerge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into oc-dev am...
Atanas Kirilov [Thu, 28 Jun 2018 01:29:36 +0000 (18:29 -0700)]
Merge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into oc-dev am: 000036eb4c am: 00bf4c5b5c
am: 2b8be3932b

Change-Id: I2ad28e6a718946be431fcda0cbb8efa719b46db3

6 years agoMerge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into oc-dev am...
Atanas Kirilov [Thu, 28 Jun 2018 01:27:10 +0000 (18:27 -0700)]
Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into oc-dev am: 8b047ec8a2
am: 245cc0559f

Change-Id: I904c603cf4838f12067b9548058b85e53a843fd0

6 years agoMerge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into oc-dev
Atanas Kirilov [Thu, 28 Jun 2018 00:57:17 +0000 (17:57 -0700)]
Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into oc-dev
am: 8b047ec8a2

Change-Id: I0c6522feec4b1baccf3c2c8ffb0d79bdebedb9b2

6 years agoMerge "Backport Prevent shortcut info package name spoofing" into oc-dev am: c6dbcc137e
Atanas Kirilov [Thu, 28 Jun 2018 00:37:57 +0000 (17:37 -0700)]
Merge "Backport Prevent shortcut info package name spoofing" into oc-dev am: c6dbcc137e
am: dcc95b94f8

Change-Id: I23209ea505140a48177b1b4fe78d36699240653e

6 years agoMerge "Backport Prevent shortcut info package name spoofing" into oc-dev
Atanas Kirilov [Thu, 28 Jun 2018 00:25:10 +0000 (17:25 -0700)]
Merge "Backport Prevent shortcut info package name spoofing" into oc-dev
am: c6dbcc137e

Change-Id: Ib3becad73fadba2be82e44bc6fb4afc3c1921a6a

6 years agoMerge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into oc-dev am...
Atanas Kirilov [Thu, 28 Jun 2018 00:21:25 +0000 (17:21 -0700)]
Merge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into oc-dev am: 000036eb4c
am: 00bf4c5b5c

Change-Id: I5cfc94bc9781c29a423a95a43d775e6bea6271b7

6 years ago[automerger skipped] Merge "Backporting of b/77821568" into oc-dev am: 9774459633...
Atanas Kirilov [Thu, 28 Jun 2018 00:09:53 +0000 (17:09 -0700)]
[automerger skipped] Merge "Backporting of b/77821568" into oc-dev am: 9774459633 am: f3f6e2f9ee
am: 1b67b798cf  -s ours

Change-Id: I1f209b583519e73c0912db7583b34324003a5526

6 years agoMerge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into oc-dev
Atanas Kirilov [Wed, 27 Jun 2018 23:56:45 +0000 (16:56 -0700)]
Merge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into oc-dev
am: 000036eb4c

Change-Id: Ic71e3f93036902b2d9452c05e7cdb6e4df2fb0e0

6 years agoMerge "Backporting of b/77821568" into oc-dev am: 9774459633
Atanas Kirilov [Wed, 27 Jun 2018 23:56:36 +0000 (16:56 -0700)]
Merge "Backporting of b/77821568" into oc-dev am: 9774459633
am: f3f6e2f9ee

Change-Id: I1445ecb89dba24df5e89089fbf0aff308331aea0

6 years agoMerge "Backporting of b/77821568" into oc-dev
Atanas Kirilov [Wed, 27 Jun 2018 23:42:36 +0000 (16:42 -0700)]
Merge "Backporting of b/77821568" into oc-dev
am: 9774459633

Change-Id: Ie0d176b94d15be65918b5f67bf9ed7f49f632def

6 years agoMerge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into oc-dev
Atanas Kirilov [Wed, 27 Jun 2018 23:29:41 +0000 (23:29 +0000)]
Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into oc-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a am: 06848a3f8f skipped: c3e741e530
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a am: 06848a3f8f
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a
  RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing

6 years agoMerge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into nyc-mr2-dev
Atanas Kirilov [Wed, 27 Jun 2018 23:29:41 +0000 (23:29 +0000)]
Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into nyc-mr2-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a am: 06848a3f8f
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a
  RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing

6 years agoMerge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into cw-f-dev
Atanas Kirilov [Wed, 27 Jun 2018 23:29:41 +0000 (23:29 +0000)]
Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into cw-f-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing am: 2f7d50058a
  RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing

6 years agoMerge "Backport Prevent shortcut info package name spoofing" into oc-dev
Atanas Kirilov [Wed, 27 Jun 2018 23:26:08 +0000 (23:26 +0000)]
Merge "Backport Prevent shortcut info package name spoofing" into oc-dev

6 years agoMerge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into oc-dev
Atanas Kirilov [Wed, 27 Jun 2018 23:25:42 +0000 (23:25 +0000)]
Merge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into oc-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e am: 0eda2602cd skipped: 430c4395a3
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e am: 0eda2602cd
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c
  RESTRICT AUTOMERGE: Backporting of b/77821568

6 years agoMerge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into nyc-mr2-dev
Atanas Kirilov [Wed, 27 Jun 2018 23:25:42 +0000 (23:25 +0000)]
Merge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into nyc-mr2-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e am: 0eda2602cd
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c
  RESTRICT AUTOMERGE: Backporting of b/77821568

6 years agoMerge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into cw-f-dev
Atanas Kirilov [Wed, 27 Jun 2018 23:25:42 +0000 (23:25 +0000)]
Merge changes from topic "am-8acf63d1-cfe0-4950-98c3-1d2367987749" into cw-f-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4 am: 24d402096e
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c am: b9c3b099e4
  [automerger] RESTRICT AUTOMERGE: Backporting of b/77821568 am: 4bc1c2445c
  RESTRICT AUTOMERGE: Backporting of b/77821568

6 years agoMerge "Backporting of b/77821568" into oc-dev
Atanas Kirilov [Wed, 27 Jun 2018 23:25:27 +0000 (23:25 +0000)]
Merge "Backporting of b/77821568" into oc-dev

6 years agoP is for PAINT.
Dan Sandler [Thu, 3 May 2018 00:01:38 +0000 (20:01 -0400)]
P is for PAINT.

Bug: 109925861
Test: adb shell am start \
        -a android.intent.action.MAIN \
        -c com.android.internal.category.PLATLOGO
Merged-In: Ic3020007c716be264e9523d6dbae9e13a95fa571
Change-Id: Ic3020007c716be264e9523d6dbae9e13a95fa571

6 years agoFix in Wifi activity updates
Siddharth Ray [Mon, 18 Jun 2018 01:28:44 +0000 (18:28 -0700)]
Fix in Wifi activity updates

When Wifi firmware resets link layer stats, it sometimes returns a value
for On time which is much larger than the duration of the report.
On time = Idle time + Rx time + Tx time.
This change prevents those errors from affecting Wifi power metrics.

BUG:110325882
Test:
adb shell dumpsys batterystats
WiFi Scan time:  12s 302ms
WiFi Idle time:   5m 48s 634ms
WiFi Rx time:     24s 232ms
WiFi Tx time:     10s 510ms

Change-Id: I7b69fc728b275f89154dd0c1d7382576ebfadc29

6 years agoMerge "ImageReader: Set inverse diplay transform if needed" into pi-dev
TreeHugger Robot [Wed, 27 Jun 2018 19:26:42 +0000 (19:26 +0000)]
Merge "ImageReader: Set inverse diplay transform if needed" into pi-dev

6 years agoActivate dark theme when the UiMode is UI_MODE_NIGHT_YES.
Dan Sandler [Thu, 21 Jun 2018 17:57:28 +0000 (13:57 -0400)]
Activate dark theme when the UiMode is UI_MODE_NIGHT_YES.

This change also activates night mode when the device enters
battery saver (saving substantial power on OLED screens).

Bug: 80307398
Test: adb shell service call uimode 4 i32 1 # nightfall
      adb shell service call uimode 4 i32 2 # morningtide

Change-Id: I9c08a749d4cd99ab7231363b045949eb2e830dfa

6 years agoMerge "DO NOT MERGE Log notification interruptions to TRON" into pi-dev
TreeHugger Robot [Wed, 27 Jun 2018 01:09:48 +0000 (01:09 +0000)]
Merge "DO NOT MERGE Log notification interruptions to TRON" into pi-dev

6 years agoMerge "Make BT icon more prominent" into pi-dev
TreeHugger Robot [Tue, 26 Jun 2018 23:24:30 +0000 (23:24 +0000)]
Merge "Make BT icon more prominent" into pi-dev

6 years agoDo not create highlight if track width is invalid
Matthew Ng [Tue, 26 Jun 2018 22:22:56 +0000 (15:22 -0700)]
Do not create highlight if track width is invalid

Test: change display font size
Change-Id: I29b97dee07d39b1b1efd4871b625a859d7fa2e09
Fixes: 110814530

6 years agoMerge "Make RttTextStream's read interruptible" into pi-dev
Hall Liu [Tue, 26 Jun 2018 22:00:17 +0000 (22:00 +0000)]
Merge "Make RttTextStream's read interruptible" into pi-dev

6 years agoMerge "Do not animate scrims when launching camera" into pi-dev
Lucas Dupin [Tue, 26 Jun 2018 21:48:16 +0000 (21:48 +0000)]
Merge "Do not animate scrims when launching camera" into pi-dev

6 years agoDO NOT MERGE Log notification interruptions to TRON
Julia Reynolds [Mon, 18 Jun 2018 13:29:19 +0000 (09:29 -0400)]
DO NOT MERGE Log notification interruptions to TRON

Test: manual
Bug: 110209821
Change-Id: Ic3521f36127aa0e928d0be5ce9819c78c2bc9bc5

6 years agoMerge "Hide system apps until installed (1/2)" into pi-dev
Andrew Sapperstein [Tue, 26 Jun 2018 20:03:38 +0000 (20:03 +0000)]
Merge "Hide system apps until installed (1/2)" into pi-dev

6 years agoDo not animate scrims when launching camera
Lucas Dupin [Tue, 12 Jun 2018 02:16:03 +0000 (19:16 -0700)]
Do not animate scrims when launching camera

There's already a black overlay with a camera icon, it's not necessary
to animate the scrims.

Change-Id: I52472372420eb8ba052a17cdde147d24dafadce0
Fixes: 109767309
Test: double tap power button from lock screen and aod

6 years agoMerge "Docs: fixed variables" into pi-dev
Laura Davis [Tue, 26 Jun 2018 16:42:43 +0000 (16:42 +0000)]
Merge "Docs: fixed variables" into pi-dev

6 years agoCorrect the keystore alias used for secure imports
Shawn Willden [Sat, 23 Jun 2018 21:38:02 +0000 (15:38 -0600)]
Correct the keystore alias used for secure imports

An Android-O timeframe refactor removed all use of keystore "skey"
aliases.  Creating one not only partially reverses that refactor, but
it also results in a key alias which cannot be deleted in some cases,
causing AndroidKeyStoreTest failures during the second run of CTS.

Bug: 80228327
Test: CTS tests ImportWrappedKeyTest and AndroidKeyStoreTest, in that order
Change-Id: I348ba421f29cdf6c65fc98be3a25d19938d559c1

6 years agoMerge "Defer stop for all activities becoming invisible" into pi-dev
Jorim Jaggi [Tue, 26 Jun 2018 11:34:03 +0000 (11:34 +0000)]
Merge "Defer stop for all activities becoming invisible" into pi-dev

6 years agoImageReader: Set inverse diplay transform if needed
Emilian Peev [Tue, 26 Jun 2018 09:13:39 +0000 (10:13 +0100)]
ImageReader: Set inverse diplay transform if needed

Image transform sometimes could be missing the inverse
display flag. Any buffers that pass through BQs will
have this bit reset and moved in a separate buffer item
field. To restore and pass the original transform forward
check whether the flag got reset and re-enable it
accordingly.

Bug: 110641448
Test: Manual using application,
Camera CTS

Change-Id: Ia849f62333be40038a02768563b2f93e2ccf61ce

6 years agoMake RttTextStream's read interruptible
Hall Liu [Tue, 26 Jun 2018 02:48:33 +0000 (19:48 -0700)]
Make RttTextStream's read interruptible

Wrap the FileInputStream in a java.nio.Channel so that sending a
Thread.interrupt() to the thread blocked on the read will actually do
something.

Change-Id: Icc11ba69167f448e2b33d9a1a13a1dfa5e5d0d58
Fixes: 110570772
Test: manual (follow repro steps in bug, but type really fast),treehugger

6 years agoHide system apps until installed (1/2)
Rhed Jao [Wed, 13 Jun 2018 03:16:16 +0000 (11:16 +0800)]
Hide system apps until installed (1/2)

Applying this mechanism for system carrier apps to make visibility
reasonable from the user's perspective. In other words, before
hidden system apps have been installed, they wouldn't be listed
via APIs in PackageManager which are used at all apps list and
search in Settings and so on.

Test: atest CarrierAppUtilsTest
Test: atest PackageManagerTest
Test: cts DeviceOwnerTest
Test: gts ManagedProfileProvisioningHostsideTest
Bug: 74068582
Change-Id: I1f23aba589b98351a1871a44a3058b67c416f351

6 years agoMerge "Don't apply filter in readback, when there is no scaling" into pi-dev
TreeHugger Robot [Mon, 25 Jun 2018 23:20:23 +0000 (23:20 +0000)]
Merge "Don't apply filter in readback, when there is no scaling" into pi-dev

6 years agoForce redraw after wallpaper is loaded
Santiago Etchebehere [Mon, 25 Jun 2018 22:58:13 +0000 (15:58 -0700)]
Force redraw after wallpaper is loaded

Use mNeedsDrawAfterLoadingWallpaper to determine if redraw
is needed.

Test: manual: set different wallpapers, or use the sample
app in b/110432281

Change-Id: Ibd5639ce59e9b59869f067705b9db25f7de8b201

Fixes: 110432281
Bug: 110432281
Bug: 109972857

6 years agoMerge "docs: fixed broken link" into pi-dev
Laura Davis [Mon, 25 Jun 2018 21:27:48 +0000 (21:27 +0000)]
Merge "docs: fixed broken link" into pi-dev

6 years agoDefer stop for all activities becoming invisible
Jorim Jaggi [Mon, 25 Jun 2018 14:14:50 +0000 (16:14 +0200)]
Defer stop for all activities becoming invisible

If we are deferring a stop until a window is becoming visible,
it's a good idea to also defer stopping all other activities that
are go into stopping state to avoid flickers.

Furthermore we need to fix an issue where activities weren't
cleared from mActivitiesWaitingForVisibleActivity which messed
up the newly introduced logic.

This fixes an issue with quickstep when swiping right and the
previous activity hasn't finished pausing yet when we start the
new activity. In the normal case, prev=Launcher and all is fine,
as we wait with stopping launcher until the animation is done. In
the bad case, prev=the previous activity that was on screen before
swiping, so Launcher doesn't get added to the waiting list, which
means that it will be stopped too early, aborting the animation
because Launcher is also driving it.

Test: ActivityManagerDisplayLockedKeyguardTests
Test: go/wm-smoke
Test: Swipe right from Chrome to any other app, observe no jump
Fixes: 80313326
Bug: 110032866
Change-Id: I39454fe218ac10ef73cc4ca23efc7c9fb3bc87ad

6 years agoMerge "docs: fixed typo in deprecation message" into pi-dev
Laura Davis [Mon, 25 Jun 2018 20:46:59 +0000 (20:46 +0000)]
Merge "docs: fixed typo in deprecation message" into pi-dev

6 years agoMerge "Quick scrub has gradient follow user drag" into pi-dev
TreeHugger Robot [Mon, 25 Jun 2018 20:39:46 +0000 (20:39 +0000)]
Merge "Quick scrub has gradient follow user drag" into pi-dev

6 years agoMerge "docs: fixed broken link" into pi-dev
Laura Davis [Mon, 25 Jun 2018 20:09:17 +0000 (20:09 +0000)]
Merge "docs: fixed broken link" into pi-dev

6 years agoDocs: fixed variables
Laura Davis [Mon, 25 Jun 2018 20:05:24 +0000 (13:05 -0700)]
Docs: fixed variables

Test: make ds-docs

Bug: 25134282
Change-Id: Ic91dd3820a409f0f28e23575090e3fd624a0fac0

6 years agoQuick scrub has gradient follow user drag
Matthew Ng [Tue, 12 Jun 2018 23:42:11 +0000 (16:42 -0700)]
Quick scrub has gradient follow user drag

Removed the track drawable and draws a gradient translated to the
position of the drag of the user as the track's background.

Test: quickscrub
Change-Id: Iee893e5f96f4954c77307c5ff9b762a04bd7de9a
Fixes: 109882517

6 years agoMake BT icon more prominent
Evan Laird [Mon, 25 Jun 2018 17:48:26 +0000 (13:48 -0400)]
Make BT icon more prominent

Bluetooth is now rated higher than work profile, cast, and vpn. Also
move volume to the other side of location per the spec.

Test: visual
Change-Id: I169ec5e6d09355e0237aad2f6ee586069d93fd36
Fixes: 110475634

6 years agoRestore separate challenge state on error
Pavel Grafov [Mon, 25 Jun 2018 11:13:38 +0000 (12:13 +0100)]
Restore separate challenge state on error

Otherwise if something goes wrong when tying the profile to the primary
user, challenge will remain in inconsistent state and the user won't
be able to unlock the profile.

Bug: 110262879
Test: manual, unified both compliant and uncompliant challenge.
Change-Id: I2bea3867541f43cbabd5cabbe8a0f61acc2602ca

6 years agoMerge "Conserve expansion after re-inflation" into pi-dev
TreeHugger Robot [Sat, 23 Jun 2018 08:05:06 +0000 (08:05 +0000)]
Merge "Conserve expansion after re-inflation" into pi-dev

6 years agoConserve expansion after re-inflation
Lucas Dupin [Thu, 21 Jun 2018 18:41:34 +0000 (11:41 -0700)]
Conserve expansion after re-inflation

We were updating most of the PhoneStatusBarView state during
re-inflation but not the expansion and its fraction.

Test: Pull down shade, run: adb shell service call overlay 4 s16 "com.android.systemui.theme.dark" i32 1 i32 0
Test: Switch to guest user, switch back
Test: Reboot, look at status bar
Change-Id: I41669fb32419ad02a11586ba248a68b47d450413
Merged-In: I41669fb32419ad02a11586ba248a68b47d450413
Fixes: 110530608
Fixes: 110147405
Fixes: 79122419

6 years agoMerge "Camera: Update surface sharing format restrictions" into pi-dev
TreeHugger Robot [Sat, 23 Jun 2018 00:11:04 +0000 (00:11 +0000)]
Merge "Camera: Update surface sharing format restrictions" into pi-dev

6 years agodocs: fixed typo in deprecation message
Laura Davis [Mon, 11 Jun 2018 17:33:17 +0000 (10:33 -0700)]
docs: fixed typo in deprecation message

Test: make ds-docs

Bug: 68303139
Change-Id: I7fc9f35bc118f8b661740a46f52d62beea1e67f1