OSDN Git Service

android-x86/frameworks-base.git
6 years agoFix migration of O DND visual effects settings
Julia Reynolds [Thu, 12 Jul 2018 18:24:56 +0000 (14:24 -0400)]
Fix migration of O DND visual effects settings

In O the settings were in the 'allow' section, not the 'disallow'
section, so the conditional needs to be reversed.

Test: runtest systemui-notification, manual
Change-Id: Icfcb328ac1d44b83b11d185be40c4ec696ebfb25
Fixes: 111313535

6 years ago[automerger skipped] Merge "[DO NOT MERGE] Update P light greylist in AOSP" am: 21593...
David Brazdil [Wed, 18 Jul 2018 13:18:55 +0000 (06:18 -0700)]
[automerger skipped] Merge "[DO NOT MERGE] Update P light greylist in AOSP" am: 21593137ac  -s ours am: 2abea6bc94  -s ours
am: 36c25a5c93  -s ours

Change-Id: Id8e846e4ddce700a6e811a6700794f80d119938c

6 years ago[automerger skipped] Merge "[DO NOT MERGE] Update P light greylist in AOSP" am: 21593...
David Brazdil [Wed, 18 Jul 2018 13:14:52 +0000 (06:14 -0700)]
[automerger skipped] Merge "[DO NOT MERGE] Update P light greylist in AOSP" am: 21593137ac  -s ours
am: 2abea6bc94  -s ours

Change-Id: Ifc02a70713a1dcaad612ec99684b60ce9dc12c7c

6 years ago[automerger skipped] Merge "[DO NOT MERGE] Update P light greylist in AOSP"
David Brazdil [Wed, 18 Jul 2018 13:10:27 +0000 (06:10 -0700)]
[automerger skipped] Merge "[DO NOT MERGE] Update P light greylist in AOSP"
am: 21593137ac  -s ours

Change-Id: I8bb94ce755d710460fcd74d2f8d4ab0d198ba533

6 years agoMerge "Repin home once setup is complete" into pi-dev am: 31e9d9d32b
Jorim Jaggi [Wed, 18 Jul 2018 12:17:26 +0000 (05:17 -0700)]
Merge "Repin home once setup is complete" into pi-dev am: 31e9d9d32b
am: 106ae23742

Change-Id: Ifb4856b92c21146a4326a52112745b6b16822cb6

6 years agoMerge "Repin home once setup is complete" into pi-dev
Jorim Jaggi [Wed, 18 Jul 2018 12:09:42 +0000 (05:09 -0700)]
Merge "Repin home once setup is complete" into pi-dev
am: 31e9d9d32b

Change-Id: Iab49d0893ae591c78334a49c33f153ecab3f0239

6 years agoMerge "Use Base64 from android.util in LocalTransport"
TreeHugger Robot [Wed, 18 Jul 2018 11:59:59 +0000 (11:59 +0000)]
Merge "Use Base64 from android.util in LocalTransport"

6 years agoMerge "Repin home once setup is complete" into pi-dev
Jorim Jaggi [Wed, 18 Jul 2018 11:57:08 +0000 (11:57 +0000)]
Merge "Repin home once setup is complete" into pi-dev

6 years agoMerge "[DO NOT MERGE] Update P light greylist in AOSP"
David Brazdil [Wed, 18 Jul 2018 11:49:00 +0000 (11:49 +0000)]
Merge "[DO NOT MERGE] Update P light greylist in AOSP"

6 years ago[DO NOT MERGE] Update P light greylist in AOSP
David Brazdil [Wed, 18 Jul 2018 09:29:10 +0000 (10:29 +0100)]
[DO NOT MERGE] Update P light greylist in AOSP

Publish the final light greylist of P for external developers.

Test: N/A
Change-Id: I5513ee2ee555bf1dced7f52b36de3df7ac85747a

6 years agoMerge "Fix double close in NativeLibraryHelper.openApkFd."
TreeHugger Robot [Wed, 18 Jul 2018 07:57:08 +0000 (07:57 +0000)]
Merge "Fix double close in NativeLibraryHelper.openApkFd."

6 years agoMerge "Fix potential crash when per-procstate cpu times tracking is turned on."
Sudheer Shanka [Wed, 18 Jul 2018 05:03:12 +0000 (05:03 +0000)]
Merge "Fix potential crash when per-procstate cpu times tracking is turned on."

6 years ago[automerger skipped] Merge "Fix for incorrect cycle evaluation in computeOomAdj DO...
Amith Yamasani [Wed, 18 Jul 2018 01:20:59 +0000 (18:20 -0700)]
[automerger skipped] Merge "Fix for incorrect cycle evaluation in computeOomAdj DO NOT MERGE" into pi-dev am: 9d77aaec85
am: 39935ebb52  -s ours

Change-Id: I6cd0d6b6e78b2036f584a9d0270c5d6b08eb29ad

6 years agoFix double close in NativeLibraryHelper.openApkFd.
Josh Gao [Tue, 17 Jul 2018 22:00:31 +0000 (15:00 -0700)]
Fix double close in NativeLibraryHelper.openApkFd.

Prior to this patch, we were taking the file descriptor owned by a
ParcelFileDescriptor, and passing it into ZipFileRO::openFd, which
expects to take ownership of the file descriptor, closing it upon
destruction. This leads to a double-close when the ParcelFileDescriptor
tries to close itself. Switch to passing a duped copy of the file
descriptor to ZipFileRO::openFd.

Test: `pm install foo.apk` with fdsan
Change-Id: Ida4ca4a37b82875dc4eef1f37bf2322c422fe038

6 years agoMerge "Fix for incorrect cycle evaluation in computeOomAdj DO NOT MERGE" into pi-dev
Amith Yamasani [Wed, 18 Jul 2018 01:13:38 +0000 (18:13 -0700)]
Merge "Fix for incorrect cycle evaluation in computeOomAdj DO NOT MERGE" into pi-dev
am: 9d77aaec85

Change-Id: Ie4e65d42c44a2a45418f5bd27155efc6c4869276

6 years agoMerge "Add SUSPEND_APPS permission to shell"
TreeHugger Robot [Wed, 18 Jul 2018 01:07:21 +0000 (01:07 +0000)]
Merge "Add SUSPEND_APPS permission to shell"

6 years agoMerge "Fix for incorrect cycle evaluation in computeOomAdj DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 18 Jul 2018 00:56:18 +0000 (00:56 +0000)]
Merge "Fix for incorrect cycle evaluation in computeOomAdj DO NOT MERGE" into pi-dev

6 years agoMerge "Defer always on top state when task gets maximized"
Kazuki Takise [Tue, 17 Jul 2018 23:56:21 +0000 (23:56 +0000)]
Merge "Defer always on top state when task gets maximized"

6 years ago[automerger skipped] Merge "Ensure Notification re-post with setOnlyAlertOnce(true...
Tyler Gunn [Tue, 17 Jul 2018 22:36:23 +0000 (15:36 -0700)]
[automerger skipped] Merge "Ensure Notification re-post with setOnlyAlertOnce(true) silences sound." am: bbe8990162  -s ours am: 9bc17a66e6
am: 72e042db9d  -s ours

Change-Id: Iaedfd0ee40d32f7b040ae0e9871a8f3d8aab552d

6 years ago[automerger skipped] Merge "Ensure Notification re-post with setOnlyAlertOnce(true...
Tyler Gunn [Tue, 17 Jul 2018 22:26:49 +0000 (15:26 -0700)]
[automerger skipped] Merge "Ensure Notification re-post with setOnlyAlertOnce(true) silences sound." am: bbe8990162  -s ours
am: 9bc17a66e6

Change-Id: I3bd5ec5a2867f02f02fdbb906bc2323e8724c6e6

6 years agoMerge "Create night version of resources for dark theme"
TreeHugger Robot [Tue, 17 Jul 2018 22:22:27 +0000 (22:22 +0000)]
Merge "Create night version of resources for dark theme"

6 years ago[automerger skipped] Merge "Ensure Notification re-post with setOnlyAlertOnce(true...
Tyler Gunn [Tue, 17 Jul 2018 22:16:41 +0000 (15:16 -0700)]
[automerger skipped] Merge "Ensure Notification re-post with setOnlyAlertOnce(true) silences sound."
am: bbe8990162  -s ours

Change-Id: Ic8cd7c12d58d9f75b1d952a7e9fca6cbe3f8fb33

6 years agoMerge "Use quick_qs_total_height when QS is not disabled"
TreeHugger Robot [Tue, 17 Jul 2018 22:10:21 +0000 (22:10 +0000)]
Merge "Use quick_qs_total_height when QS is not disabled"

6 years agoMerge "UsbDescriptor: Add finite timeout to control transfer" am: 20dca26f41 am:...
Jerry Zhang [Tue, 17 Jul 2018 22:09:35 +0000 (15:09 -0700)]
Merge "UsbDescriptor: Add finite timeout to control transfer" am: 20dca26f41 am: 4bff76be80
am: db3a291e9d

Change-Id: Ibf2bc0673e156919baf77c0db2033aa521b08052

6 years agoMerge "UsbDescriptor: Add finite timeout to control transfer" am: 20dca26f41
Jerry Zhang [Tue, 17 Jul 2018 22:00:31 +0000 (15:00 -0700)]
Merge "UsbDescriptor: Add finite timeout to control transfer" am: 20dca26f41
am: 4bff76be80

Change-Id: Ie89d8a02c4e92e4d7d2372fad29abdba0c2fc568

6 years agoMerge "Revoke permissions defined in a to-be removed package."
Hongming Jin [Tue, 17 Jul 2018 21:33:20 +0000 (21:33 +0000)]
Merge "Revoke permissions defined in a to-be removed package."

6 years agoMerge "libmedia2_jni: use libbinder as shared library"
TreeHugger Robot [Tue, 17 Jul 2018 21:11:35 +0000 (21:11 +0000)]
Merge "libmedia2_jni: use libbinder as shared library"

6 years agoAdd SUSPEND_APPS permission to shell
Suprabh Shukla [Mon, 16 Jul 2018 20:23:21 +0000 (13:23 -0700)]
Add SUSPEND_APPS permission to shell

Since this permission protects system apis, this is required for
instrumentation tests.

Test: atest com.google.android.suspendapps.gts.SuspendPackagesTest

Bug: 79773970
Change-Id: Ib283018c50cc19c3958bd61e2d19befbf2805cc5

6 years agoMerge "UsbDescriptor: Add finite timeout to control transfer"
Jerry Zhang [Tue, 17 Jul 2018 20:59:15 +0000 (13:59 -0700)]
Merge "UsbDescriptor: Add finite timeout to control transfer"
am: 20dca26f41

Change-Id: I86a916694a497bedb7d2df8a64dd17e0e15ce332

6 years agoMerge "Ensure Notification re-post with setOnlyAlertOnce(true) silences sound."
Tyler Gunn [Tue, 17 Jul 2018 20:29:59 +0000 (20:29 +0000)]
Merge "Ensure Notification re-post with setOnlyAlertOnce(true) silences sound."

6 years agoMerge "Handle new current.txt format."
Jeff Sharkey [Tue, 17 Jul 2018 20:01:51 +0000 (20:01 +0000)]
Merge "Handle new current.txt format."

6 years agoHandle new current.txt format.
Jeff Sharkey [Tue, 17 Jul 2018 19:29:40 +0000 (13:29 -0600)]
Handle new current.txt format.

We're starting to see "@interface" show up, so handle them like any
other interface.  We're also seeing more details argument lists
with names and annotations; ignore them for now, since all our
existing lint checks work on the "real" data type.

Verified that it handles new support library current.txt files
without causing any regressions against existing framework
current.txt files.

Test: manual inspection
Bug: 111555356
Change-Id: Id11c3561edd317e4ba1a9b43993fd96d8243e00d

6 years agoUse quick_qs_total_height when QS is not disabled
Evan Laird [Tue, 17 Jul 2018 19:55:40 +0000 (15:55 -0400)]
Use quick_qs_total_height when QS is not disabled

A change in the logic of QuickStatusBarHeader#updateResources
mistakenly used quick_qs_offset_height for the total height of the qqs
panel instead of quick_qs_total_height. This caused the quick-quick
settings panel to be too short on devices which don't have a large
notch.

Test: visual, on device without a notch
Change-Id: I0deed2560328501e547b04239133e350cdac4ff6
Fixes: 111554577

6 years agoMerge "UsbDescriptor: Add finite timeout to control transfer"
Jerry Zhang [Tue, 17 Jul 2018 19:47:29 +0000 (19:47 +0000)]
Merge "UsbDescriptor: Add finite timeout to control transfer"

6 years agoMerge "BatteryStatsHistory needs to public for unit test to work."
TreeHugger Robot [Tue, 17 Jul 2018 19:43:08 +0000 (19:43 +0000)]
Merge "BatteryStatsHistory needs to public for unit test to work."

6 years agoMerge "Docs: Removed narrative content." into pi-dev am: b4f7c414a6
Laura Davis [Tue, 17 Jul 2018 18:50:10 +0000 (11:50 -0700)]
Merge "Docs: Removed narrative content." into pi-dev am: b4f7c414a6
am: 7f05ea78dd

Change-Id: Ibfff8f72707a41936a4259a90d20eda559b44b0d

6 years agoMerge "Docs: Removed narrative content." into pi-dev
Laura Davis [Tue, 17 Jul 2018 18:40:15 +0000 (11:40 -0700)]
Merge "Docs: Removed narrative content." into pi-dev
am: b4f7c414a6

Change-Id: I9b482df22bcef0fd24f6e56e2a4718bef229f4ad

6 years agoRevoke permissions defined in a to-be removed package.
Hongming Jin [Tue, 19 Jun 2018 19:35:37 +0000 (12:35 -0700)]
Revoke permissions defined in a to-be removed package.

Bug: 67319274
Test: run cts-dev --module CtsPermissionTestCases --test android.permission.cts.RemovePermissionTest#permissionShouldBeRevokedIfRemoved
Change-Id: Id23535d6c4d2fcf5c86dc1338af13a561b32154c

6 years ago[automerger skipped] Merge "Remove unneeded JNI method" am: 1febe4196e -s ours am...
John Reck [Tue, 17 Jul 2018 18:29:28 +0000 (11:29 -0700)]
[automerger skipped] Merge "Remove unneeded JNI method" am: 1febe4196e  -s ours am: 8f66efbffe  -s ours
am: d9b9a52299  -s ours

Change-Id: Ic2e3ec3bf3ca60cc648196b30422494144972e8c

6 years agoEnsure Notification re-post with setOnlyAlertOnce(true) silences sound.
Tyler Gunn [Tue, 3 Jul 2018 19:38:49 +0000 (12:38 -0700)]
Ensure Notification re-post with setOnlyAlertOnce(true) silences sound.

Where a notification channel has an associated looping sound, it should
be possible to re-post the notification with setOnlyAlertOnce(true) to
cause the notification channel's sound to silence.

When re-posting the notification, this CL fixes an issue where
NotificationManagerService wouldn't call clearSoundLocked to stop playing
the sound, resulting in the notification continuing to playing the sound
associated with the notification channel.

Test: Manual testing, updated unit test
Bug: 110348674
Merged-In: I3ec26f0804bcf59f7356a2329b73ba8ed8f7ea51
Change-Id: I3ec26f0804bcf59f7356a2329b73ba8ed8f7ea51

6 years agoMerge "Docs: Removed narrative content." into pi-dev
Laura Davis [Tue, 17 Jul 2018 18:23:09 +0000 (18:23 +0000)]
Merge "Docs: Removed narrative content." into pi-dev

6 years agoMerge "Ensure Notification re-post with setOnlyAlertOnce(true) silences sound."
Tyler Gunn [Tue, 17 Jul 2018 18:22:51 +0000 (18:22 +0000)]
Merge "Ensure Notification re-post with setOnlyAlertOnce(true) silences sound."

6 years ago[automerger skipped] Merge "Remove unneeded JNI method" am: 1febe4196e -s ours
John Reck [Tue, 17 Jul 2018 18:20:25 +0000 (11:20 -0700)]
[automerger skipped] Merge "Remove unneeded JNI method" am: 1febe4196e  -s ours
am: 8f66efbffe  -s ours

Change-Id: I463ac35b909cbc3c5b6edeba2b370d4dc233f778

6 years ago[automerger skipped] Merge "Remove unneeded JNI method"
John Reck [Tue, 17 Jul 2018 18:12:31 +0000 (11:12 -0700)]
[automerger skipped] Merge "Remove unneeded JNI method"
am: 1febe4196e  -s ours

Change-Id: I3a366342f1a94c34e0815e5941b7b13816a637c8

6 years agoMerge "DPM: Propagate StrongBox-related exception"
TreeHugger Robot [Tue, 17 Jul 2018 18:08:31 +0000 (18:08 +0000)]
Merge "DPM: Propagate StrongBox-related exception"

6 years agoBatteryStatsHistory needs to public for unit test to work.
Hui Yu [Tue, 17 Jul 2018 00:03:48 +0000 (17:03 -0700)]
BatteryStatsHistory needs to public for unit test to work.

Otherwise BatteryStatsHistoryTest gets "Illegal class access" error.

Test: atest BatteryStatsHistoryTest.java
Change-Id: I6efc9df24e1fd15cc3cdc4611a65d3e41efa63da

6 years agoFix potential crash when per-procstate cpu times tracking is turned on.
Sudheer Shanka [Tue, 17 Jul 2018 01:00:46 +0000 (18:00 -0700)]
Fix potential crash when per-procstate cpu times tracking is turned on.

When per-procstate cpu times tracking is turned on,
BatteryStatsImpl tries to access mKernelSingleUidTimeReader but
it's possible that mKernelSingleUidTimeReader hasn't been initialized
yet after a reboot and this could lead to a system_server crash.

Bug: 111523951
Test: manual
Change-Id: Id014f23fbe31fed64fba769f14ba4396a003092e

6 years agolibmedia2_jni: use libbinder as shared library
Steven Moreland [Tue, 17 Jul 2018 17:11:34 +0000 (10:11 -0700)]
libmedia2_jni: use libbinder as shared library

In order to prevent prebuilts from freezing the libbinder
internal API (the wire protocol), it is being made a
shared-only library.

Bug: 111454508
Test: m only
Change-Id: If7f8bd931dae5310eda6c230f20179418c2efa43

6 years agoMerge "Hide apks not needed for a specific sku" into pi-dev am: 776b4e2dfa
Ruchi Kandoi [Tue, 17 Jul 2018 17:02:43 +0000 (10:02 -0700)]
Merge "Hide apks not needed for a specific sku" into pi-dev am: 776b4e2dfa
am: dae7a5ddd1

Change-Id: I3100d4b3187d35fbfdd5edb4e730c1734b5b596c

6 years agoMerge "Remove unneeded JNI method"
Treehugger Robot [Tue, 17 Jul 2018 17:00:30 +0000 (17:00 +0000)]
Merge "Remove unneeded JNI method"

6 years agoMerge "Merge "Track OkHttp changes" am: 0083876870 am: 7e6a128ec7 am: f6e34a96ed"
Android Build Merger (Role) [Tue, 17 Jul 2018 16:48:08 +0000 (16:48 +0000)]
Merge "Merge "Track OkHttp changes" am: 0083876870 am: 7e6a128ec7 am: f6e34a96ed"

6 years agoMerge "Track OkHttp changes" am: 0083876870 am: 7e6a128ec7
Neil Fuller [Tue, 17 Jul 2018 16:47:38 +0000 (09:47 -0700)]
Merge "Track OkHttp changes" am: 0083876870 am: 7e6a128ec7
am: f6e34a96ed

Change-Id: Ia54aa0c10bc96bab0f7df1f93956c925f9bf5e17

6 years agoMerge "Expose async & counter publicly"
John Reck [Tue, 17 Jul 2018 16:46:56 +0000 (16:46 +0000)]
Merge "Expose async & counter publicly"

6 years agoMerge "Hide apks not needed for a specific sku" into pi-dev
Ruchi Kandoi [Tue, 17 Jul 2018 16:41:08 +0000 (09:41 -0700)]
Merge "Hide apks not needed for a specific sku" into pi-dev
am: 776b4e2dfa

Change-Id: I1219ddda2808492d84e182c4192e4caee27ba297

6 years agoMerge "Track OkHttp changes" am: 0083876870
Neil Fuller [Tue, 17 Jul 2018 16:32:31 +0000 (09:32 -0700)]
Merge "Track OkHttp changes" am: 0083876870
am: 7e6a128ec7

Change-Id: I8f94f0fa4e29770ccff3531a71552db230cf6bac

6 years agoMerge "Hide apks not needed for a specific sku" into pi-dev
TreeHugger Robot [Tue, 17 Jul 2018 16:26:23 +0000 (16:26 +0000)]
Merge "Hide apks not needed for a specific sku" into pi-dev

6 years agoMerge "Track OkHttp changes"
Neil Fuller [Tue, 17 Jul 2018 16:16:15 +0000 (09:16 -0700)]
Merge "Track OkHttp changes"
am: 0083876870

Change-Id: Id872a519323e5e3237fb708fa7d2d9eeae579650

6 years agoMerge changes from topic "downloadvuln"
Jeff Sharkey [Tue, 17 Jul 2018 16:12:14 +0000 (16:12 +0000)]
Merge changes from topic "downloadvuln"

* changes:
  Execute "strict" queries with extra parentheses.
  Add support for appending standalone phrases.

6 years agoMerge "Fix TextureView.getBitmap with scale layer transform"
TreeHugger Robot [Tue, 17 Jul 2018 16:04:15 +0000 (16:04 +0000)]
Merge "Fix TextureView.getBitmap with scale layer transform"

6 years agoExpose async & counter publicly
John Reck [Mon, 16 Jul 2018 17:42:35 +0000 (10:42 -0700)]
Expose async & counter publicly

Also add some go-faster to the JNI

Before:
android.os.TracePerfTest:INSTRUMENTATION_STATUS: enabled_mean=13
INSTRUMENTATION_STATUS: enabled_median=13
INSTRUMENTATION_STATUS: enabled_min=13
INSTRUMENTATION_STATUS: enabled_standardDeviation=0
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: beginEndSection_mean=3849
INSTRUMENTATION_STATUS: beginEndSection_median=3850
INSTRUMENTATION_STATUS: beginEndSection_min=3829
INSTRUMENTATION_STATUS: beginEndSection_standardDeviation=14
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: counter_mean=1836
INSTRUMENTATION_STATUS: counter_median=1837
INSTRUMENTATION_STATUS: counter_min=1832
INSTRUMENTATION_STATUS: counter_standardDeviation=2
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: asyncBeginEnd_mean=4992
INSTRUMENTATION_STATUS: asyncBeginEnd_median=4988
INSTRUMENTATION_STATUS: asyncBeginEnd_min=4964
INSTRUMENTATION_STATUS: asyncBeginEnd_standardDeviation=21
INSTRUMENTATION_STATUS_CODE: -1

After:
android.os.TracePerfTest:INSTRUMENTATION_STATUS: enabled_mean=13
INSTRUMENTATION_STATUS: enabled_median=13
INSTRUMENTATION_STATUS: enabled_min=13
INSTRUMENTATION_STATUS: enabled_standardDeviation=0
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: beginEndSection_mean=2974
INSTRUMENTATION_STATUS: beginEndSection_median=2971
INSTRUMENTATION_STATUS: beginEndSection_min=2958
INSTRUMENTATION_STATUS: beginEndSection_standardDeviation=15
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: counter_mean=1737
INSTRUMENTATION_STATUS: counter_median=1739
INSTRUMENTATION_STATUS: counter_min=1732
INSTRUMENTATION_STATUS: counter_standardDeviation=3
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: asyncBeginEnd_mean=3677
INSTRUMENTATION_STATUS: asyncBeginEnd_median=3679
INSTRUMENTATION_STATUS: asyncBeginEnd_min=3663
INSTRUMENTATION_STATUS: asyncBeginEnd_standardDeviation=11
INSTRUMENTATION_STATUS_CODE: -1

Test: builds, benchmarks, verified tracing still works
Bug: 111503982
Change-Id: I71cb026d034bf9b9f97427d10d5ff9ce3d103561

6 years agoMerge "Fix system server leaked fd dump"
Nandana Dutt [Tue, 17 Jul 2018 14:19:20 +0000 (14:19 +0000)]
Merge "Fix system server leaked fd dump"

6 years agoMerge "Track OkHttp changes"
Treehugger Robot [Tue, 17 Jul 2018 13:43:10 +0000 (13:43 +0000)]
Merge "Track OkHttp changes"

6 years agoFix TextureView.getBitmap with scale layer transform
Stan Iliev [Thu, 12 Jul 2018 20:53:59 +0000 (16:53 -0400)]
Fix TextureView.getBitmap with scale layer transform

Fix TextureView.getBitmap to capture content only from the layer.

Bug: 111401911
Test: A new test TextureViewTest.testTransformScale is passing
Change-Id: I2b9cee17fc48de7b12ed03d5b4f173ce5445dbfe

6 years agoMerge "Increase PerformBackupTask unit coverage"
Bernardo Rufino [Tue, 17 Jul 2018 12:46:20 +0000 (12:46 +0000)]
Merge "Increase PerformBackupTask unit coverage"

6 years agoMerge changes I4e06b3f9,Iffcbbb82,If9dd6913
Martijn Coenen [Tue, 17 Jul 2018 12:20:30 +0000 (12:20 +0000)]
Merge changes I4e06b3f9,Iffcbbb82,If9dd6913

* changes:
  Move proxy debug info dumping back to Java.
  Dump top binder proxy interface names in dumpsys.
  Make BinderProxy @hide public class.

6 years agoDPM: Propagate StrongBox-related exception
Eran Messeri [Mon, 9 Jul 2018 16:58:26 +0000 (17:58 +0100)]
DPM: Propagate StrongBox-related exception

When the caller attempts to generate a key via DevicePolicyManager
(using DevicePolicyManager.generateKeyPair), and specifies that
StrongBox should be used, throw the right exception indicating
StrongBox unavailability - the same one that is thrown if the same
parameters were passed to the KeyStore's key generation method.

This is achieved by catching the StrongBoxUnavailableException in
KeyChain, returning an error code indicating this particular failure
to the DevicePolicyManagerService, which then propagates it by
throwing a service-specific exception with a value indicating
StrongBox unavailability.
The DevicePolicyManager then raises StrongBoxUnavailableException.

Prior to this change the exception propagated from KeyChain would be
a generic failure so the caller would simply get a null result.

Bug: 110882855
Bug: 111183576
Bug: 111322478
Test: atest CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.MixedDeviceOwnerTest#testKeyManagement
Change-Id: I9abe3f449b48eb5a960fafbc15c59b9b4ce7a966

6 years agoIncrease PerformBackupTask unit coverage
Bernardo Rufino [Thu, 28 Jun 2018 07:30:14 +0000 (08:30 +0100)]
Increase PerformBackupTask unit coverage

With KV Refactor in mind.
* Added tests around empty queue and single package backups.
* Refactored a bit some of the existing tests.
* Moved from mocking BMS to using a real instance and had to adjust a
  few things for this.

Test: atest PerformBackupTaskTest
Change-Id: I0ee3be32c7cbac5ed2cdc2717408749907c15ade

6 years agoMerge changes If285d71a,Iffe5be7c am: f37950d8c3 am: c9b5e65747
David Brazdil [Tue, 17 Jul 2018 11:03:07 +0000 (04:03 -0700)]
Merge changes If285d71a,Iffe5be7c am: f37950d8c3 am: c9b5e65747
am: 3efb177ca6

Change-Id: If7f397e4be6ace357f7a563b4546a9a7694fce65

6 years agoRepin home once setup is complete
Jorim Jaggi [Sun, 15 Jul 2018 12:24:38 +0000 (14:24 +0200)]
Repin home once setup is complete

On a fresh device, the home intent resovles to SetupWizard. After
setup is complete, it will resolve to the regular home app. In
order to accomodate for that, repin home app once user setup is
complete.

Test: Wipe device, complete SUW, inspect pinner
Bug: 111132016
Change-Id: I904ecd2fed26bc1a3baf45c1b54da5fc6352d773

6 years ago[automerger skipped] [DO NOT MERGE] Revert "Build dark greylist from public + light...
David Brazdil [Tue, 17 Jul 2018 10:56:43 +0000 (03:56 -0700)]
[automerger skipped] [DO NOT MERGE] Revert "Build dark greylist from public + light grey API" am: ed1f171cb9  -s ours am: dd540c644f  -s ours
am: 548c2c0710  -s ours

Change-Id: I2c4c0a33dfd3eb8551f623fad24a078f51759710

6 years agoMerge "Remove unused line in PrecomputedText"
TreeHugger Robot [Tue, 17 Jul 2018 10:53:58 +0000 (10:53 +0000)]
Merge "Remove unused line in PrecomputedText"

6 years agoMerge changes If285d71a,Iffe5be7c am: f37950d8c3
David Brazdil [Tue, 17 Jul 2018 10:53:35 +0000 (03:53 -0700)]
Merge changes If285d71a,Iffe5be7c am: f37950d8c3
am: c9b5e65747

Change-Id: I047358920ecc478de076c32384390ba856bd8c99

6 years ago[automerger skipped] [DO NOT MERGE] Revert "Build dark greylist from public + light...
David Brazdil [Tue, 17 Jul 2018 10:48:42 +0000 (03:48 -0700)]
[automerger skipped] [DO NOT MERGE] Revert "Build dark greylist from public + light grey API" am: ed1f171cb9  -s ours
am: dd540c644f  -s ours

Change-Id: Ie2115a3f82b78a632dec2c85527755bcb667253a

6 years agoFix system server leaked fd dump
Nandana Dutt [Thu, 12 Jul 2018 16:02:57 +0000 (17:02 +0100)]
Fix system server leaked fd dump

'lsof' was execed to dump the open file descriptors, but it does
not have the same permissions as system_server, presumably due to
SELinux restrcitions.

Now we get a list of open file descriptors from /proc/<pid>/fd and
resolve them via readlink, all inside system_server.

Test: Manually tested on a device and compared with the output of adb
lsof.

Change-Id: I4db8369a3a2bb0009c776277a8a6f92f72857ef8

6 years agoMerge changes If285d71a,Iffe5be7c
David Brazdil [Tue, 17 Jul 2018 10:43:13 +0000 (03:43 -0700)]
Merge changes If285d71a,Iffe5be7c
am: f37950d8c3

Change-Id: I667c07fa75e0cc5badad3f297fc14316a2acfc42

6 years ago[automerger skipped] [DO NOT MERGE] Revert "Build dark greylist from public + light...
David Brazdil [Tue, 17 Jul 2018 10:37:16 +0000 (03:37 -0700)]
[automerger skipped] [DO NOT MERGE] Revert "Build dark greylist from public + light grey API"
am: ed1f171cb9  -s ours

Change-Id: Ied01c65b3352129d1ced3e41d2ce281077c52d37

6 years agoTrack OkHttp changes
Neil Fuller [Tue, 10 Jul 2018 20:13:34 +0000 (21:13 +0100)]
Track OkHttp changes

As part of creating a full facade over OkHttp code there
are some changes to OkHttp-related classes that must be tracked.
See the related external/okhttp commit for details.

Some non-functional lint / WS changes have been made as part of this
change.

Test: Ran CtsLibcoreOkHttpTestCases entirely
Test: Ran CtsLibcoreTestCases entirely
Test: run cts-dev -m CtsNetTestCases -t android.net.http.cts.HttpResponseCacheTest
Bug: 111055375
Change-Id: I0b0ec21fa376ea33e2fa5486e203e92d3c3337cf

6 years agoUse Base64 from android.util in LocalTransport
Bernardo Rufino [Tue, 17 Jul 2018 09:17:43 +0000 (10:17 +0100)]
Use Base64 from android.util in LocalTransport

Stop using bouncycastle as requested in the bug.

Bug: 111440841
Test: 1. Without changes
         a. adb shell bmgr transport android/com.android.internal.backup.LocalTransport
         b. adb shell bmgr backupnow com.android.providers.settings
         c. adb shell ls /cache/backup/1/_delta/<kv_package> #=> Base64 encoded keys
      2. Build and flash this CL
         a. adb shell bmgr restore 1 com.android.providers.settings #=> verify stuff restored
         b. adb shell rm /cache/backup/1/_delta/com.android.providers.settings/* /data/backup/com.android.internal.backup.LocalTransport/com.android.providers.settings
 c. adb shell bmgr backupnow com.android.providers.settings
 d. adb shell ls
 /cache/backup/1/_delta/com.android.providers.settings # Verify same keys as 1c

Change-Id: I305bbae0e0af3639c1d45def19872e6da84624df

6 years agoMove proxy debug info dumping back to Java.
Martijn Coenen [Fri, 6 Jul 2018 10:04:48 +0000 (12:04 +0200)]
Move proxy debug info dumping back to Java.

This had to be called from native because serialization
was done from native, but now that serialization is in Java
we can move this back to a more logical place.

Also, this allows us to dump the per-UID proxy counts in
this situation again.

Bug: 109888955
Test: sailfish builds, proxy debug info shown on hitting limits
Change-Id: I4e06b3f93e30ed1c7868ec9e018709a7e796e441

6 years agoDump top binder proxy interface names in dumpsys.
Martijn Coenen [Fri, 6 Jul 2018 09:26:26 +0000 (11:26 +0200)]
Dump top binder proxy interface names in dumpsys.

To facilitate real-time debugging.

Bug: 109888955
Test: builds, adb shell dumpsys activity binder-proxies shows output
Change-Id: Iffcbbb824f4050b6fb8f556c8b4d09115e53da18

6 years agoMerge changes If285d71a,Iffe5be7c
David Brazdil [Tue, 17 Jul 2018 08:24:36 +0000 (08:24 +0000)]
Merge changes If285d71a,Iffe5be7c

* changes:
  Revert^2: Build dark greylist from public + light grey API
  [DO NOT MERGE] Revert "Build dark greylist from public + light grey API"

6 years agoMake BinderProxy @hide public class.
Martijn Coenen [Mon, 9 Jul 2018 18:22:10 +0000 (20:22 +0200)]
Make BinderProxy @hide public class.

To make some future refactoring easier.

Added some JavaDoc (mostly links to android.os.IBinder)
to make checkstyle happy.

Test: builds
Change-Id: If9dd6913868a34ea1e3d14fee1860a4ff368e06b

6 years agoMerge "Remove SimChangeListener from Tethering" am: 6e35b2c596 am: fbab182f44
Mark Chien [Tue, 17 Jul 2018 07:30:29 +0000 (00:30 -0700)]
Merge "Remove SimChangeListener from Tethering" am: 6e35b2c596 am: fbab182f44
am: cd70c87c65

Change-Id: I57f979caab4aaf4e9f6481b27995a49e44ba31d9

6 years agoMerge "Remove SimChangeListener from Tethering" am: 6e35b2c596
Mark Chien [Tue, 17 Jul 2018 07:21:09 +0000 (00:21 -0700)]
Merge "Remove SimChangeListener from Tethering" am: 6e35b2c596
am: fbab182f44

Change-Id: I7c386065179e8eae8dff0cfbf5227eb259dbb9b9

6 years agoMerge "Remove SimChangeListener from Tethering"
Mark Chien [Tue, 17 Jul 2018 07:10:56 +0000 (00:10 -0700)]
Merge "Remove SimChangeListener from Tethering"
am: 6e35b2c596

Change-Id: Ie85375b760684bfeb2af0231dbe81592866a4e48

6 years agoDefer always on top state when task gets maximized
Kazuki Takise [Wed, 27 Jun 2018 08:05:11 +0000 (17:05 +0900)]
Defer always on top state when task gets maximized

This CL enables always on top to be restored/deferred when
stacks switch between freeform and fullscreen.

Bug: 110494387
Test: ActivityStackTests
Test: DisplayContentTests
Test: go/wm-smoke
Change-Id: Iccb9824f845dea4925fac5d5dcb5eeaab2acdfcd

6 years agoMerge "Remove SimChangeListener from Tethering"
Mark Chien [Tue, 17 Jul 2018 05:49:09 +0000 (05:49 +0000)]
Merge "Remove SimChangeListener from Tethering"

6 years agoMerge "Make stop complete notification call in to ActivityManager blocking."
TreeHugger Robot [Tue, 17 Jul 2018 05:46:21 +0000 (05:46 +0000)]
Merge "Make stop complete notification call in to ActivityManager blocking."

6 years agoMerge "Remove menu container's focus to avoid feedback background"
TreeHugger Robot [Tue, 17 Jul 2018 03:03:03 +0000 (03:03 +0000)]
Merge "Remove menu container's focus to avoid feedback background"

6 years agoMerge "Log Wtf when UsageStats missing over a day of events"
TreeHugger Robot [Tue, 17 Jul 2018 02:45:52 +0000 (02:45 +0000)]
Merge "Log Wtf when UsageStats missing over a day of events"

6 years agoMerge "Release wakelock in LocationManagerService if client thread is dead"
TreeHugger Robot [Tue, 17 Jul 2018 02:20:55 +0000 (02:20 +0000)]
Merge "Release wakelock in LocationManagerService if client thread is dead"

6 years ago[automerger skipped] Merge "old paths contains all entries when updating" am: 600aeb1...
Mathieu Chartier [Tue, 17 Jul 2018 01:37:24 +0000 (18:37 -0700)]
[automerger skipped] Merge "old paths contains all entries when updating" am: 600aeb124b  -s ours am: 89e9a1ad43  -s ours
am: e295a0e4e3  -s ours

Change-Id: If1377d662d0c668cef6269f464e496a9566b1c2c

6 years agoMerge "Menu ime button takes nav button width to show recents button for tablets"
TreeHugger Robot [Tue, 17 Jul 2018 01:33:19 +0000 (01:33 +0000)]
Merge "Menu ime button takes nav button width to show recents button for tablets"

6 years ago[automerger skipped] Merge "old paths contains all entries when updating" am: 600aeb1...
Mathieu Chartier [Tue, 17 Jul 2018 01:28:55 +0000 (18:28 -0700)]
[automerger skipped] Merge "old paths contains all entries when updating" am: 600aeb124b  -s ours
am: 89e9a1ad43  -s ours

Change-Id: Ie23f6aae28f3452623523855a030f6fb30a4b6fd

6 years ago[automerger skipped] Merge "old paths contains all entries when updating"
Mathieu Chartier [Tue, 17 Jul 2018 01:22:04 +0000 (18:22 -0700)]
[automerger skipped] Merge "old paths contains all entries when updating"
am: 600aeb124b  -s ours

Change-Id: Ib77887238935225bda9457414b9ec5a41e6919d6

6 years agoRemove unused line in PrecomputedText
Seigo Nonaka [Tue, 17 Jul 2018 01:09:32 +0000 (18:09 -0700)]
Remove unused line in PrecomputedText

Bug: N/A
Test: N/A
Change-Id: I2456116657d8be893a8c477df14a5de490fbaa37

6 years agoRemove menu container's focus to avoid feedback background
Matthew Ng [Thu, 28 Jun 2018 19:45:26 +0000 (12:45 -0700)]
Remove menu container's focus to avoid feedback background

Menu container contains no icons but holds a few buttons that may appear
later but using a mouse a square background will appear because it has
focus. Remove the focus to remove the feedback background ripple.

Test: use mouse and tap the area right of the home button
Change-Id: If4e57c1a27ca7fbe38712dc1ac6f9e5d2bb76c49
Fixes: 110042464

6 years agoRelease wakelock in LocationManagerService if client thread is dead
Yu-Han Yang [Wed, 11 Jul 2018 22:24:11 +0000 (15:24 -0700)]
Release wakelock in LocationManagerService if client thread is dead

- also put a timeout on the wakelock so that it won't be held forever.

Bug: 111321558
Fixes: 111321558
Test: Tested on device.
Change-Id: I36e90f73143ff12d8622dbbb3aad643b283d17ce

6 years agoMerge "Fix timestamp error in GaugeMetric"
TreeHugger Robot [Tue, 17 Jul 2018 00:38:36 +0000 (00:38 +0000)]
Merge "Fix timestamp error in GaugeMetric"

6 years ago[automerger skipped] Merge "Revert "Revert "Update SubscriptionInfo o use strings...
Hall Liu [Tue, 17 Jul 2018 00:30:20 +0000 (17:30 -0700)]
[automerger skipped] Merge "Revert "Revert "Update SubscriptionInfo o use strings for mccmnc""" am: fce4acd679  -s ours am: 9818f2599f  -s ours
am: a4480d33e2  -s ours

Change-Id: I2470d095213d72e8a6c96c657778b8d9db66001d