OSDN Git Service

android-x86/frameworks-base.git
6 years agoRemove @SystemApi annotation from private or package-private members
Jiyong Park [Wed, 3 Jan 2018 00:50:28 +0000 (09:50 +0900)]
Remove @SystemApi annotation from private or package-private members

Some private or package-private members have been marked as @SystemApi,
which do not make sense as they aren't accessible to apps due to the
access modifier. Having annotation on such members hasn't been harmful,
but will soon trigger CTS failures when we do the exact match for
SystemAPIs; a runtime entity annotated as @SystemApi have to exist in
the documented API (e.g. system-current.txt). So, removing the bogus
annotations.

Bug: 67891551
Test: m -j does not require m update-system-api
Change-Id: I0083475ef5435cf9a582c2ce1be469c92328fe69

6 years agoMerge "Add "write" comment to content tool."
TreeHugger Robot [Mon, 1 Jan 2018 20:59:22 +0000 (20:59 +0000)]
Merge "Add "write" comment to content tool."

6 years agoAdd "write" comment to content tool.
Jeff Sharkey [Mon, 1 Jan 2018 19:28:27 +0000 (12:28 -0700)]
Add "write" comment to content tool.

This gives developers an easy way to push temporary testing
configuration data into their apps.  We also now have symmetry with
the existing "read" command.

Test: builds, boots, example commands work
Bug: 64672411
Change-Id: I7bf6360915e1e4eb0d6ceaaec674f09931e28c6c

6 years ago1/ Support nested message and repeated fields in statsd.
Yangster-mac [Sat, 23 Dec 2017 01:19:39 +0000 (17:19 -0800)]
1/ Support nested message and repeated fields in statsd.
2/ Filter gauge fields by FieldMatcher.
3/ Wire up wakelock attribution chain.
4/ e2e test: wakelock duration metric with aggregated predicate dimensions.
5/ e2e test: count metric with multiple metric condition links for 2 predicates and 1 non-sliced predicate.

Test: statsd unit test passed.

Change-Id: I89db31cb068184a54e0a892fad710966d3127bc9

6 years agoMerge "New intent for microphone mute change notification"
Jean-Michel Trivi [Fri, 29 Dec 2017 21:25:46 +0000 (21:25 +0000)]
Merge "New intent for microphone mute change notification"

6 years agoMerge "NotificationPlayer: fix focus not abandoned on playback error"
Jean-Michel Trivi [Fri, 29 Dec 2017 17:57:20 +0000 (17:57 +0000)]
Merge "NotificationPlayer: fix focus not abandoned on playback error"

6 years agoMerge "Fix the lint checking of CROSS_PROFILE_APPS_SERVICE"
TreeHugger Robot [Fri, 29 Dec 2017 17:05:33 +0000 (17:05 +0000)]
Merge "Fix the lint checking of CROSS_PROFILE_APPS_SERVICE"

6 years agoMerge "Fix flicker with "trampoline" activities"
Jorim Jaggi [Fri, 29 Dec 2017 16:51:12 +0000 (16:51 +0000)]
Merge "Fix flicker with "trampoline" activities"

6 years agoMerge "Add missing calls to key sync task in LockSettingsService"
TreeHugger Robot [Fri, 29 Dec 2017 16:16:29 +0000 (16:16 +0000)]
Merge "Add missing calls to key sync task in LockSettingsService"

6 years agoFix flicker with "trampoline" activities
Jorim Jaggi [Fri, 29 Dec 2017 14:41:36 +0000 (15:41 +0100)]
Fix flicker with "trampoline" activities

WC.mSurfaceControl starts hidden, but gets immediately shown
in onParentSet. Reflect that in mLastSurfaceShowing in
AppWindowToken such that it gets hidden immediately again while
preparing the first frame.

Test: Go to settings -> Add account, observe no flicker in the
status bar
Test: go/wm-smoke

Change-Id: I6493e75fcac31784662ebcb0e24a4e5c698ed337

6 years agoMerge "Add notification on succesful backups"
TreeHugger Robot [Fri, 29 Dec 2017 14:40:18 +0000 (14:40 +0000)]
Merge "Add notification on succesful backups"

6 years agoMerge "WorkSource: Fix getAttributionUid."
Narayan Kamath [Fri, 29 Dec 2017 12:54:34 +0000 (12:54 +0000)]
Merge "WorkSource: Fix getAttributionUid."

6 years agoAdd missing calls to key sync task in LockSettingsService
Robert Berry [Thu, 28 Dec 2017 17:34:38 +0000 (17:34 +0000)]
Add missing calls to key sync task in LockSettingsService

On my device at least this was never getting called. Not sure if both
of these are needed.

Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I693cf2f12a6d113b68dd4a8515aee97f4efb7b18

6 years agoFix the lint checking of CROSS_PROFILE_APPS_SERVICE
Tony Mak [Fri, 29 Dec 2017 11:02:02 +0000 (11:02 +0000)]
Fix the lint checking of CROSS_PROFILE_APPS_SERVICE

Bug: 67765768
Test: BUILD

Change-Id: I6ce794c5266018c55ccbdf73c9c9cc5dd944a66b

6 years agoMerge "Splits AnomalyTracker into two files"
TreeHugger Robot [Fri, 29 Dec 2017 05:18:41 +0000 (05:18 +0000)]
Merge "Splits AnomalyTracker into two files"

6 years agoMerge "Add ICCID_PREFIX column in CarridId DB" am: 73200d9ac9 am: 33395ea925
sqian [Thu, 28 Dec 2017 22:32:04 +0000 (22:32 +0000)]
Merge "Add ICCID_PREFIX column in CarridId DB" am: 73200d9ac9 am: 33395ea925
am: 448c1fd15a  -s ours

Change-Id: Iab6bb2713567efd65e6865c08399edaf3e741cc2

6 years agoMerge "Add ICCID_PREFIX column in CarridId DB" am: 73200d9ac9
sqian [Thu, 28 Dec 2017 22:23:48 +0000 (22:23 +0000)]
Merge "Add ICCID_PREFIX column in CarridId DB" am: 73200d9ac9
am: 33395ea925

Change-Id: Ied8bb4b9302533bc13ebcd49c80cdd1ca6c0641d

6 years agoMerge "Add ICCID_PREFIX column in CarridId DB"
sqian [Thu, 28 Dec 2017 22:17:09 +0000 (22:17 +0000)]
Merge "Add ICCID_PREFIX column in CarridId DB"
am: 73200d9ac9

Change-Id: I142e4f3c760e3b0216d89c197d760e9acc0255fd

6 years agoMerge "Add ICCID_PREFIX column in CarridId DB"
Treehugger Robot [Thu, 28 Dec 2017 22:07:25 +0000 (22:07 +0000)]
Merge "Add ICCID_PREFIX column in CarridId DB"

6 years agoMerge "Move debug log summary to WifiUtils"
TreeHugger Robot [Thu, 28 Dec 2017 19:24:24 +0000 (19:24 +0000)]
Merge "Move debug log summary to WifiUtils"

6 years agoAdd notification on succesful backups
Denis Kuznetsov [Wed, 27 Dec 2017 15:21:22 +0000 (16:21 +0100)]
Add notification on succesful backups

Bug: 63885845
Test: make RunFrameworksServicesRoboTests

Change-Id: I6c8d04de7f5d7e82d695b1bf36de0aa27452db19

6 years agoMerge "Encode vault params in key sync task"
TreeHugger Robot [Thu, 28 Dec 2017 19:10:15 +0000 (19:10 +0000)]
Merge "Encode vault params in key sync task"

6 years agoMerge "AAPT2: <uses-library /> and <library /> don't need to be Java packages"
Adam Lesinski [Thu, 28 Dec 2017 19:01:10 +0000 (19:01 +0000)]
Merge "AAPT2: <uses-library /> and <library /> don't need to be Java packages"

6 years agoMerge "Disable sanitizer entirely in ResourceTypes.cpp" am: f7c56624c7 am: 203055b322
Ivan Lozano [Thu, 28 Dec 2017 18:59:50 +0000 (18:59 +0000)]
Merge "Disable sanitizer entirely in ResourceTypes.cpp" am: f7c56624c7 am: 203055b322
am: 6637d85f4a  -s ours

Change-Id: I46acecdf92bc1245db338ce9f7f06fdf12385bdf

6 years agoMerge "Disable sanitizer entirely in ResourceTypes.cpp" am: f7c56624c7
Ivan Lozano [Thu, 28 Dec 2017 18:50:02 +0000 (18:50 +0000)]
Merge "Disable sanitizer entirely in ResourceTypes.cpp" am: f7c56624c7
am: 203055b322

Change-Id: I63e2754a278e3acb5aaa9a6a6d94dc4174a5e8b4

6 years agoMerge "Added AIDL for cell identity" am: 470ba9d471 am: a205f42172
Jack Yu [Thu, 28 Dec 2017 18:45:01 +0000 (18:45 +0000)]
Merge "Added AIDL for cell identity" am: 470ba9d471 am: a205f42172
am: e8f6d7cc27  -s ours

Change-Id: I6f67650af967bd280bf5509bd30ed1655dcd3680

6 years agoMerge "Disable sanitizer entirely in ResourceTypes.cpp"
Ivan Lozano [Thu, 28 Dec 2017 18:43:41 +0000 (18:43 +0000)]
Merge "Disable sanitizer entirely in ResourceTypes.cpp"
am: f7c56624c7

Change-Id: I1843878f7194696896700572f2259f5f2c6b92c2

6 years agoMerge "Added AIDL for cell identity" am: 470ba9d471
Jack Yu [Thu, 28 Dec 2017 18:35:32 +0000 (18:35 +0000)]
Merge "Added AIDL for cell identity" am: 470ba9d471
am: a205f42172

Change-Id: I82ea2e0019e513a3404e8bde0cda6514203df7dc

6 years agoMerge "Disable sanitizer entirely in ResourceTypes.cpp"
Treehugger Robot [Thu, 28 Dec 2017 18:32:51 +0000 (18:32 +0000)]
Merge "Disable sanitizer entirely in ResourceTypes.cpp"

6 years agoMerge "Added AIDL for cell identity"
Jack Yu [Thu, 28 Dec 2017 18:29:10 +0000 (18:29 +0000)]
Merge "Added AIDL for cell identity"
am: 470ba9d471

Change-Id: Id3cc4071c60828a6f86499d135d6dbb842dcaeb1

6 years agoMerge "Added AIDL for cell identity"
Treehugger Robot [Thu, 28 Dec 2017 18:17:34 +0000 (18:17 +0000)]
Merge "Added AIDL for cell identity"

6 years agoMerge "Merge "Fix temporary file name strlcpy size." am: d4d542e0ca am: 02d370c464...
Android Build Merger (Role) [Thu, 28 Dec 2017 18:13:33 +0000 (18:13 +0000)]
Merge "Merge "Fix temporary file name strlcpy size." am: d4d542e0ca am: 02d370c464 am: d74ed9646b"

6 years agoMerge "AAPT2: Keep file enumeration consistent across platforms"
Adam Lesinski [Thu, 28 Dec 2017 18:13:05 +0000 (18:13 +0000)]
Merge "AAPT2: Keep file enumeration consistent across platforms"

6 years agoMerge "Fix temporary file name strlcpy size." am: d4d542e0ca am: 02d370c464
Ivan Lozano [Thu, 28 Dec 2017 18:13:02 +0000 (18:13 +0000)]
Merge "Fix temporary file name strlcpy size." am: d4d542e0ca am: 02d370c464
am: d74ed9646b

Change-Id: Ia649723ad4a067b41efa5d9182d21beb24ea8276

6 years agoMerge "Fix temporary file name strlcpy size." am: d4d542e0ca
Ivan Lozano [Thu, 28 Dec 2017 18:06:15 +0000 (18:06 +0000)]
Merge "Fix temporary file name strlcpy size." am: d4d542e0ca
am: 02d370c464

Change-Id: If6efd949c11a39c4df2ed753c6b850785f8872e4

6 years agoMerge "Fix temporary file name strlcpy size."
Ivan Lozano [Thu, 28 Dec 2017 17:59:37 +0000 (17:59 +0000)]
Merge "Fix temporary file name strlcpy size."
am: d4d542e0ca

Change-Id: Id9de2553e39a1999ed7e43c3ce5bc18b63fc2221

6 years agoMerge "Fix temporary file name strlcpy size."
Ivan Lozano [Thu, 28 Dec 2017 17:48:50 +0000 (17:48 +0000)]
Merge "Fix temporary file name strlcpy size."

6 years agoDisable sanitizer entirely in ResourceTypes.cpp
Ivan Lozano [Tue, 7 Nov 2017 21:26:27 +0000 (13:26 -0800)]
Disable sanitizer entirely in ResourceTypes.cpp

The unsigned integer overflow sanitizer catches an overflow on
Res_GETPACKAGE usages. This is used in a number of places in
ResourceTypes.cpp in a number of large functions. For now, lets disable
the sanitizer in this source file.

Test: Compiles and device boots without runtime errors.
Bug: 30969751
Change-Id: Id9e0776ef819c895a3194a32da5c85459f1af431
Merged-In: Id9e0776ef819c895a3194a32da5c85459f1af431
(cherry picked from commit 02828740da7481a48e7872b22213047025894525)

6 years agoAAPT2: <uses-library /> and <library /> don't need to be Java packages
Adam Lesinski [Wed, 20 Dec 2017 23:03:36 +0000 (15:03 -0800)]
AAPT2: <uses-library /> and <library /> don't need to be Java packages

- Also fixes issue where a failure checking the Java package of an attribute
would yield no error message.

Bug: 70722199
Test: make aapt2_tests
Change-Id: I417d5ffe18c8d4ba2f1638f9fb9ba29278ec8e94

6 years agoAAPT2: Keep file enumeration consistent across platforms
Adam Lesinski [Wed, 20 Dec 2017 22:01:14 +0000 (14:01 -0800)]
AAPT2: Keep file enumeration consistent across platforms

Filesystem directory enumeration is platform dependent, so
sort the files lexicographically according to source path before
consuming them in the compile command.

Bug: 70680618
Test: manual
Change-Id: I6706dea2eb40cbaff8a586994dd1013976e4ced4

6 years agoEncode vault params in key sync task
Robert Berry [Thu, 28 Dec 2017 12:08:30 +0000 (12:08 +0000)]
Encode vault params in key sync task

Still not sure how we're getting counter_id here, though?

Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ic473fff4a19c1d044a6381a1459eca0835a55697

6 years agoMerge "Fix child windows of windows with surface insets"
TreeHugger Robot [Thu, 28 Dec 2017 14:26:31 +0000 (14:26 +0000)]
Merge "Fix child windows of windows with surface insets"

6 years agoHook up using initialized public key in KeySyncTask
Robert Berry [Wed, 27 Dec 2017 10:53:58 +0000 (10:53 +0000)]
Hook up using initialized public key in KeySyncTask

Not sure if this is correct, PTAL. We won't have a specific uid when
the phone is unlocked, only the userId. Should the public key be
uid-specific or just userId-specific?

Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ic2ec442c8a283e747542fafa9d7b0462aa185532

6 years agoAdded AIDL for cell identity
Jack Yu [Thu, 28 Dec 2017 00:19:20 +0000 (16:19 -0800)]
Added AIDL for cell identity

Added AIDL for CellIdentityCdma, CellIdentityGsm, CellIdentityLte
and CellIdentityWcdma. This is the preliminary change for IWLAN
refactoring as network registration state will be moving into
system API.

Test: Build
bug: 64132030
Merged-In: I6763d4b6e51cf354b01ee5bfb5d37114394f3063
Change-Id: I6763d4b6e51cf354b01ee5bfb5d37114394f3063
(cherry picked from commit 31db18a4c078b77f011170a27eb95c94398efde6)

6 years agoMerge changes from topics "wrapped_key_import", "keystore_seclevels"
TreeHugger Robot [Thu, 28 Dec 2017 02:16:55 +0000 (02:16 +0000)]
Merge changes from topics "wrapped_key_import", "keystore_seclevels"

* changes:
  Add importWrappedKey to IKeystoreService.aidl
  Keystore: Use security levels

6 years agoMerge "Added AIDL for cell identity"
TreeHugger Robot [Thu, 28 Dec 2017 02:16:20 +0000 (02:16 +0000)]
Merge "Added AIDL for cell identity"

6 years agoAdded AIDL for cell identity
Jack Yu [Thu, 28 Dec 2017 00:19:20 +0000 (16:19 -0800)]
Added AIDL for cell identity

Added AIDL for CellIdentityCdma, CellIdentityGsm, CellIdentityLte
and CellIdentityWcdma. This is the preliminary change for IWLAN
refactoring as network registration state will be moving into
system API.

Test: Build
bug: 64132030
Change-Id: I6763d4b6e51cf354b01ee5bfb5d37114394f3063

6 years agoImplement RecoverableKeyStore API to set/get recovery secret types.
Dmitry Dementyev [Wed, 27 Dec 2017 19:58:45 +0000 (11:58 -0800)]
Implement RecoverableKeyStore API to set/get recovery secret types.

Bug: 66499222
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: If29f22f24438a9d050fabebf970b9ae56b0df805

6 years agoMerge "Small fix to addconfig in statsd."
TreeHugger Robot [Wed, 27 Dec 2017 23:37:20 +0000 (23:37 +0000)]
Merge "Small fix to addconfig in statsd."

6 years agoAdd ICCID_PREFIX column in CarridId DB
sqian [Thu, 30 Nov 2017 19:26:56 +0000 (11:26 -0800)]
Add ICCID_PREFIX column in CarridId DB

Bug: 64131637
Test: Treehugger runs providers/telephony/CarrierIdProviderTest.java

Change-Id: I0d118ab181dfe17a7976a0b654989a3662594d4a
Merged-In: I0d118ab181dfe17a7976a0b654989a3662594d4a
(cherry picked from commit 4fe8280dc6736ab3c59f8e384323c26212215a90)

6 years agoMerge "Log only necessary info from usagestats dump on test failure."
TreeHugger Robot [Wed, 27 Dec 2017 22:47:29 +0000 (22:47 +0000)]
Merge "Log only necessary info from usagestats dump on test failure."

6 years agoMerge "Trigger recovery agent PendingIntent in KeySyncTask"
TreeHugger Robot [Wed, 27 Dec 2017 22:38:30 +0000 (22:38 +0000)]
Merge "Trigger recovery agent PendingIntent in KeySyncTask"

6 years agoNotificationPlayer: fix focus not abandoned on playback error
Jean-Michel Trivi [Wed, 27 Dec 2017 19:55:30 +0000 (11:55 -0800)]
NotificationPlayer: fix focus not abandoned on playback error

If an exception is fired when trying to start the MediaPlayer
  after audio focus was requested, it will not be abandoned
  on error or completion.

Bug: 70727414
Test: see bug
Change-Id: Ib2a07499829890a858d5a38d46c3575d2d7b6629

6 years agoMerge "Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions"...
goneil [Wed, 27 Dec 2017 21:46:43 +0000 (21:46 +0000)]
Merge "Require that caller holds  SEND_SMS and  MODIFY_PHONES_STATE permissions" am: ee48176ad6 am: f220cdfca4
am: 663150a708  -s ours

Change-Id: I6afc251ec22979c349f5255a9c6b297e008818ea

6 years agoMerge "Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions"...
goneil [Wed, 27 Dec 2017 21:37:28 +0000 (21:37 +0000)]
Merge "Require that caller holds  SEND_SMS and  MODIFY_PHONES_STATE permissions" am: ee48176ad6
am: f220cdfca4

Change-Id: Ic809d19c8d5542b8f3a7d2a8b245a4db971165e3

6 years agoSmall fix to addconfig in statsd.
David Chen [Wed, 27 Dec 2017 21:37:01 +0000 (13:37 -0800)]
Small fix to addconfig in statsd.

AddConfiguration now returns false if the incoming byte array can't
even be parsed into the expected proto format. Unfortunately, we
can't fully evaluate if this configuration is valid. Still, this
gives the caller a chance to know that the parameters it sent can't
even be parsed.

Test: Tested that statsd still builds.
Change-Id: I7ba7c64adc4bc77549d5e9133e212a4870645786

6 years agoMerge "Remove getIntWithSubId in TelephonyManager." am: 10d1ee58f8 am: c7cebc8e8e
Malcolm Chen [Wed, 27 Dec 2017 21:32:32 +0000 (21:32 +0000)]
Merge "Remove getIntWithSubId in TelephonyManager." am: 10d1ee58f8 am: c7cebc8e8e
am: 0eff354771  -s ours

Change-Id: Idfb1d9169e05461bf534babfde9c991c479a58e8

6 years agoMerge "Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions"
goneil [Wed, 27 Dec 2017 21:31:21 +0000 (21:31 +0000)]
Merge "Require that caller holds  SEND_SMS and  MODIFY_PHONES_STATE permissions"
am: ee48176ad6

Change-Id: I831efeddbebd4ff65d2a64f628eab84f84ecfa73

6 years agoMerge "Remove getIntWithSubId in TelephonyManager." am: 10d1ee58f8
Malcolm Chen [Wed, 27 Dec 2017 21:24:37 +0000 (21:24 +0000)]
Merge "Remove getIntWithSubId in TelephonyManager." am: 10d1ee58f8
am: c7cebc8e8e

Change-Id: I50fdbebe3decd0dad93802fdf8fa722ab7c06d07

6 years agoMerge "Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions"
Treehugger Robot [Wed, 27 Dec 2017 21:22:02 +0000 (21:22 +0000)]
Merge "Require that caller holds  SEND_SMS and  MODIFY_PHONES_STATE permissions"

6 years agoLog only necessary info from usagestats dump on test failure.
Sudheer Shanka [Wed, 27 Dec 2017 21:17:49 +0000 (13:17 -0800)]
Log only necessary info from usagestats dump on test failure.

Test: atest services/tests/servicestests/src/com/android/server/net/ConnOnActivityStartTest.java
Change-Id: Id0235a56fc9d503ff1b7693866cb800e0ac2bdbb

6 years agoMerge "Remove getIntWithSubId in TelephonyManager."
Malcolm Chen [Wed, 27 Dec 2017 21:15:31 +0000 (21:15 +0000)]
Merge "Remove getIntWithSubId in TelephonyManager."
am: 10d1ee58f8

Change-Id: I6ddf4fa541650ed9c983bd21d7e3eacf80214285

6 years agoMerge "Remove getIntWithSubId in TelephonyManager."
Treehugger Robot [Wed, 27 Dec 2017 21:06:32 +0000 (21:06 +0000)]
Merge "Remove getIntWithSubId in TelephonyManager."

6 years agoMerge "Fix "You're using your work profile" toast is shown when launcher is ...in...
TreeHugger Robot [Wed, 27 Dec 2017 20:42:23 +0000 (20:42 +0000)]
Merge "Fix "You're using your work profile" toast is shown when launcher is ...in foreground"

6 years agoMerge "Binder: Log a histogram of binder proxies to logcat on death" am: 4b7abe301c...
Andreas Gampe [Wed, 27 Dec 2017 20:34:19 +0000 (20:34 +0000)]
Merge "Binder: Log a histogram of binder proxies to logcat on death" am: 4b7abe301c am: 3c57709e70
am: 906d0c9375

Change-Id: I30960a4d831f420911b287145646be569423fdd0

6 years agoMerge "Binder: Log a histogram of binder proxies to logcat on death" am: 4b7abe301c
Andreas Gampe [Wed, 27 Dec 2017 20:24:50 +0000 (20:24 +0000)]
Merge "Binder: Log a histogram of binder proxies to logcat on death" am: 4b7abe301c
am: 3c57709e70

Change-Id: I322ced9619f9982182c5b739007988fda89c6f30

6 years agoMerge "Binder: Log a histogram of binder proxies to logcat on death"
Andreas Gampe [Wed, 27 Dec 2017 20:18:25 +0000 (20:18 +0000)]
Merge "Binder: Log a histogram of binder proxies to logcat on death"
am: 4b7abe301c

Change-Id: I8f29f452707bb38799877f23d0d04152619c81cb

6 years agoMerge "Binder: Log a histogram of binder proxies to logcat on death"
Treehugger Robot [Wed, 27 Dec 2017 20:08:25 +0000 (20:08 +0000)]
Merge "Binder: Log a histogram of binder proxies to logcat on death"

6 years agoTrigger recovery agent PendingIntent in KeySyncTask
Robert Berry [Wed, 27 Dec 2017 12:05:58 +0000 (12:05 +0000)]
Trigger recovery agent PendingIntent in KeySyncTask

Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Iafae3ff7da9bdc9e986cd19cde72170f9f438180

6 years agoMerge "Add storage for snapshots in KeySyncTask"
TreeHugger Robot [Wed, 27 Dec 2017 19:08:32 +0000 (19:08 +0000)]
Merge "Add storage for snapshots in KeySyncTask"

6 years agoMerge "Add a 'unbounded method refs only' clause to PooledLambda javadoc"
Eugene Susla [Wed, 27 Dec 2017 18:17:23 +0000 (18:17 +0000)]
Merge "Add a 'unbounded method refs only' clause to PooledLambda javadoc"

6 years agoBinder: Log a histogram of binder proxies to logcat on death
Andreas Gampe [Wed, 27 Dec 2017 17:30:45 +0000 (09:30 -0800)]
Binder: Log a histogram of binder proxies to logcat on death

To help investigate potential BinderProxy leaks, attempt to log a
histogram of BinderProxy descriptors to the logcat before asserting.

Bug: 71353150
Test: m
Change-Id: I47313814160678369b15e7dc5851d8096c286b9d

6 years agoFix child windows of windows with surface insets
Jorim Jaggi [Wed, 27 Dec 2017 16:41:25 +0000 (17:41 +0100)]
Fix child windows of windows with surface insets

We need to undo the outsetting when positioning the child.

Test: Open Dialog, enter text, select text, make sure handle is
positioned correctly
Fixes: 70777791

Change-Id: Ia64e25122499782c977a6ab45113481fd2d9f965

6 years agoSet crop and final crop for WindowAnimation
chaviw [Wed, 20 Dec 2017 23:29:04 +0000 (15:29 -0800)]
Set crop and final crop for WindowAnimation

Added crop and final crop to WindowAnimation depending on clip mode.

Test: 1. Enter split screen by dragging app from recents.
      2. In split screen, open new activities in primary window.
      3. Lock screen and unlock while in split screen

Change-Id: Idc4055de8c2c9aaa449f6387097c1970ef1d94fa

6 years agoHandle z-layering in animation layer
Jorim Jaggi [Tue, 19 Dec 2017 17:04:29 +0000 (18:04 +0100)]
Handle z-layering in animation layer

We use the prefix order to determine base layer within the
animation layer. This ensure that for the animation windows, the
z-ordering during animations doesn't change.

We then boost anything that needs a z-boost to 800570000 + prefix
order, such order within the boosted layers is preserved as well.

Also fix an issue where the thumbnail wasn't attached to the
animation layer.

Test: WindowContainerTests
Test: go/wm-smoke
Bug: 64674361
Change-Id: If5909bd87a12f1d8920c7232acab0f3d17be0f6c

6 years agoSet initial position for WindowAnimation and reparent animation leash.
chaviw [Mon, 18 Dec 2017 19:29:41 +0000 (11:29 -0800)]
Set initial position for WindowAnimation and reparent animation leash.

1. Set the initial position for the WindowAnimationSpec to be the stack
position.
2. Reparent the animation leash to mAnimationLayer
3. Updated Surface names for clarity.

Test: Opening apps animate from the correct start location. When apps
are animating, their layers are reparented to the correct animation
layer.

Change-Id: I3e3a1e45f0a0cf9d471dee105abd9bce05d1e91d

6 years agoSet stack size and position and update children surface position.
chaviw [Wed, 13 Dec 2017 00:18:29 +0000 (16:18 -0800)]
Set stack size and position and update children surface position.

Update the stack's size and position to represent the bounds. Then
update all children's positions so they are in the correct place within
the stack's bounds.

Test: Split screen, pip
Change-Id: I0372a8d20407ec35d1e8c0fc8165253f68d2f18f

6 years agoFix starting of animations
Jorim Jaggi [Mon, 18 Dec 2017 18:21:27 +0000 (19:21 +0100)]
Fix starting of animations

We need to manually process the first animation frame as
mStartTime of ValueAnimator would only be set when processing
the next animation frame.

Test: go/wm-smoke
Test: Add some additional tracing about current playing time and
observe no delay.
Bug: 64674361
Change-Id: Iad753bfb7b86cfd57f265b5084a3d24f967dcaf3

6 years agoLock free app animations (7/n): Cleanup
Jorim Jaggi [Thu, 23 Nov 2017 17:04:08 +0000 (17:04 +0000)]
Lock free app animations (7/n): Cleanup

- Make sure persister pausing is working
- Make sure Surface animation thread is being boosted
- Move all remaining fields from AppWindowAnimator and NUKE it,
also remove getAnimLayerAdjustment and do the z-boosting
directly on the AppWindowToken.

Bug: 64674361
Test: go/wm-smoke
Test: Inspect thread priorities before/during/after animations
Change-Id: Ie64c8231bcebd8536eab476ee9f2c51abf85480c

6 years agoLock free app animations (6/n): Move back-pressure to new animator
Jorim Jaggi [Mon, 20 Nov 2017 18:59:42 +0000 (19:59 +0100)]
Lock free app animations (6/n): Move back-pressure to new animator

SurfaceFlinger was currently only back-pressuring the old
animation system. Move this to the new SurfaceAnimationRunner,
such that every animation frame is presented on screen.

Test: go/wm-smoke
Test: Insert 16ms sleep statement when applying transaction, make
sure animations are still smooth.
Bug:

Change-Id: I510d22c9c4359659e7a061a26b7adad9c265b734

6 years agoLock free app animations (5/n): Reimplement skip first frame
Jorim Jaggi [Mon, 20 Nov 2017 18:49:00 +0000 (19:49 +0100)]
Lock free app animations (5/n): Reimplement skip first frame

Test: go/wm-smoke
Test: Close app, inspect transition with WindowScope, make sure
first frame of animation is skipped
Bug:

Change-Id: I68c135621df47c50696e318c4394da36ce806922

6 years agoLock free app animations (4/n): Implement thubmnail
Jorim Jaggi [Fri, 17 Nov 2017 16:46:43 +0000 (17:46 +0100)]
Lock free app animations (4/n): Implement thubmnail

Bug: 64674361
Test: go/wm-smoke
Change-Id: I8f25dae04b69613c93ccb5416c2cda2df6373103

6 years agoLock free app animations (3/n): Implement transfering animations
Jorim Jaggi [Fri, 17 Nov 2017 00:41:37 +0000 (01:41 +0100)]
Lock free app animations (3/n): Implement transfering animations

Test: go/wm-smoke
Bug: 64674361
Change-Id: I2170c31c1a95cea049bcc66978bb7737337503b3

6 years agoLock free app animations (2/n): Use SurfaceAninimator
Jorim Jaggi [Tue, 24 Oct 2017 16:21:09 +0000 (18:21 +0200)]
Lock free app animations (2/n): Use SurfaceAninimator

This is the main CL that switches over from using the legacy
animation system to using the new SurfaceAnimator for app
window animations. Also moves applyAnimationLocked to
AppWindowToken.

AppWindowAnimator still has a bunch of state that needs to be moved
into AppWindowToken in future CL's.

Test: go/wm-smoke
Bug: 64674361
Change-Id: Ifc83cbac281ce0654ecd8a1c2ca9c24a4d87c1d1

6 years agoWorkSource: Fix getAttributionUid.
Narayan Kamath [Wed, 27 Dec 2017 14:22:47 +0000 (14:22 +0000)]
WorkSource: Fix getAttributionUid.

We define it as the UID that initiated the work, and not the UID
performing the work.

Test: WorkSourceTest.
Bug: 62390666

Change-Id: I1583e3f24b492e3f11a1281215c066fedf489b5f

6 years agoFix "You're using your work profile" toast is shown when launcher is
Tony Mak [Wed, 27 Dec 2017 14:18:49 +0000 (14:18 +0000)]
Fix "You're using your work profile" toast is shown when launcher is
...in foreground

What's the problem:
getRecentTasks no longer returns home task. Check
RecentTasks.isVisibleRecentTask

Solution:
Instead of "fixing" getRecentTasks, use getLastResumedActivityUserId,
which is already used for the work profile icon in status bar.
Note that Keyguard is not an activity, so it won't change the value of
"last resumed activity user id". It should be more lightweight than
getRecentTasks anyway.

Test: Open any personal app -> screen off and on -> no toast
Test: Open any work app -> screen off and on -> observe toast
Test: Open any work app -> tap home -> scren off and on -> no toast

Change-Id: I1cc880bfa23017c9d2c5ad99d57e67b430aa4ac8
Fix: 70377375

6 years agoLock free app animations (1/n): Get rid of mAllAppWindowAnimators
Jorim Jaggi [Tue, 24 Oct 2017 16:05:26 +0000 (18:05 +0200)]
Lock free app animations (1/n): Get rid of mAllAppWindowAnimators

Test: go/wm-smoke
Bug: 64674361
Change-Id: If3d888184c99f9c43dd0dcb5455158e1dbca81c2

6 years agoPull back app transform and screen rotation transform.
Robert Carr [Wed, 27 Sep 2017 21:57:38 +0000 (14:57 -0700)]
Pull back app transform and screen rotation transform.

App transform is removed in this CL for clarity but being
re-added in Ifc83cbac281ce0654ecd8a1c2ca9c24a4d87c1d1.

Test: go/wm-smoke
Bug: 64674361
Change-Id: Idb7d7409a25cff518540077c9e189eba6d92dc43

6 years agoAdd storage for snapshots in KeySyncTask
Robert Berry [Wed, 27 Dec 2017 13:29:39 +0000 (13:29 +0000)]
Add storage for snapshots in KeySyncTask

Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I25a9d6999bec5639cc91532da1b42a8d1f911b79

6 years agoFix broken generateAndStoreKey tests
Robert Berry [Wed, 27 Dec 2017 10:58:03 +0000 (10:58 +0000)]
Fix broken generateAndStoreKey tests

Sorry, this was my fault. I thought I'd run them but obviously not.

Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ic45d59774e0aced17ef205559b2791ba7f26eabe

6 years agoMerge "Support WorkChains for WakeLock start / stop / change events."
Narayan Kamath [Wed, 27 Dec 2017 08:43:37 +0000 (08:43 +0000)]
Merge "Support WorkChains for WakeLock start / stop / change events."

6 years agoInitialise Notification*Manager dependencies directly.
Eliot Courtney [Thu, 14 Dec 2017 10:57:51 +0000 (19:57 +0900)]
Initialise Notification*Manager dependencies directly.

Currently, adding a new dependency to any of these classes means
updating the constructors of any subclasses, and the construction in the
corresponding SystemUIFactory classes and subclasses. In particular,
updating these in separate vendor/ projects is annoying. So, initialise
the dependencies using field initialisers. The downside is that it's
harder to notice circular Dependencys.

Bug: 63874929
Bug: 62602530
Test: runtest systemui
Test: Compile and run
Change-Id: I21d58d0cc0edeb6d53fb7b387c9baeec7bd80589

6 years agoRemove NotificationPresenter#getEntryManager.
Eliot Courtney [Thu, 14 Dec 2017 10:38:52 +0000 (19:38 +0900)]
Remove NotificationPresenter#getEntryManager.

Instead, pass it along with calls to setUpWithPresenter.

Bug: 63874929
Bug: 62602530
Test: runtest systemui
Test: Compile and run
Change-Id: Icd60cf671b12b33d4565cc608c6141cd580c790e

6 years agoChange all mocks that are Dependencys to be properly injected.
Eliot Courtney [Thu, 14 Dec 2017 09:54:28 +0000 (18:54 +0900)]
Change all mocks that are Dependencys to be properly injected.

If a class being unit tested is changed to Dependency.get() a dependency
rather than receiving it as an argument, the tests could break in subtle
ways. Make sure all mocked Dependencys are properly injected as test
dependencies.

Bug: 63874929
Bug: 62602530
Test: runtest systemui
Change-Id: I2b23a2ea0ac9067952624a5c302ca419685307ae

6 years agoSplit NotificationViewHierarchyManager out of StatusBar.
Eliot Courtney [Mon, 27 Nov 2017 04:27:46 +0000 (13:27 +0900)]
Split NotificationViewHierarchyManager out of StatusBar.

NotificationViewHierarchyManager handles bundling and unbundling of
notifications. In doing so, which notifications are parents/children of
the other can change. NotificationViewHierarchyManager makes sure the
view hierarchy of the notifications matches their grouping.

Bug: 63874929
Bug: 62602530
Test: runtest systemui
Test: Compile and run
Change-Id: Ia1c8ed75d4eb8df52897c5d6aa0713f8335b2a19

6 years agoSplit NotificationEntryManager out of StatusBar.
Eliot Courtney [Fri, 20 Oct 2017 04:26:58 +0000 (13:26 +0900)]
Split NotificationEntryManager out of StatusBar.

NotificationEntryManager is responsible for the adding, removing, and
updating of notifications among other things, such as their inflation
and their interaction with other Notification*Manager objects.

Bug: 63874929
Bug: 62602530
Test: runtest systemui
Test: Compile and run
Change-Id: I56f8c524875900112cdf9f6120407b61e201172f

6 years agoMerge "Document which sys services can be accessed by instant apps"
TreeHugger Robot [Tue, 26 Dec 2017 04:13:15 +0000 (04:13 +0000)]
Merge "Document which sys services can be accessed by instant apps"

6 years agoMerge "Don't record audio if UID is idle - core framework"
TreeHugger Robot [Tue, 26 Dec 2017 03:39:42 +0000 (03:39 +0000)]
Merge "Don't record audio if UID is idle - core framework"

6 years agoMerge "Expose removeAt(int) for parity with other sparse collections."
Jake Wharton [Sun, 24 Dec 2017 05:32:13 +0000 (05:32 +0000)]
Merge "Expose removeAt(int) for parity with other sparse collections."

6 years agoDocument which sys services can be accessed by instant apps
Svet Ganov [Sat, 23 Dec 2017 07:29:24 +0000 (23:29 -0800)]
Document which sys services can be accessed by instant apps

This change documents that some system services are not available
to instant apps due to the restricted security sandbox they run in.
Also ensure that if target SDK is P WallpaperManager is null if the
backing system service cannot be looked up to be consistent with
the way other system services behave.

Test: Manual

Fixes: 70984822
Fixes: 69848394

Change-Id: I9aae884d5840c92136c7d713fac87e7732dc2642