OSDN Git Service

android-x86/frameworks-base.git
5 years agoFix crash during cursor moving on BiDi text
Seigo Nonaka [Thu, 19 Jul 2018 23:22:02 +0000 (16:22 -0700)]
Fix crash during cursor moving on BiDi text

The crash was introduced by Ib66ef392c19c937718e7101f6d48fac3abe51ad0
The root cause of the crashing is requesting out-of-line access for the
horizontal width. This invalid access is silently ignored by
TextLine#measure() method but new implementation end up with out of
bounds access.

To makes behavior as old implementation, calling getHorizontal instead
of accessing measured result array.

Bug: 111580019
Test: Manually done
Change-Id: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8

5 years agoMerge "Move allocateBuffers to RT" into pi-dev am: 2f8a3a4bb8
Jorim Jaggi [Wed, 18 Jul 2018 22:19:39 +0000 (15:19 -0700)]
Merge "Move allocateBuffers to RT" into pi-dev am: 2f8a3a4bb8
am: c9756c9193

Change-Id: Ieed40312fe16a54c3e1974621b53e29b23ddcdbc

5 years agoMerge "Move allocateBuffers to RT" into pi-dev
Jorim Jaggi [Wed, 18 Jul 2018 22:06:29 +0000 (15:06 -0700)]
Merge "Move allocateBuffers to RT" into pi-dev
am: 2f8a3a4bb8

Change-Id: I6c8f84406a40fa324a4486f71fccf01f6acfe60a

5 years agoMerge "Move allocateBuffers to RT" into pi-dev
Jorim Jaggi [Wed, 18 Jul 2018 21:47:59 +0000 (21:47 +0000)]
Merge "Move allocateBuffers to RT" into pi-dev

5 years agoMerge "Extract a FakeNativeWrapper to share between tests"
TreeHugger Robot [Wed, 18 Jul 2018 21:39:19 +0000 (21:39 +0000)]
Merge "Extract a FakeNativeWrapper to share between tests"

5 years agoMerge changes I58789fdc,I74e03909,Id82f5e6d
TreeHugger Robot [Wed, 18 Jul 2018 20:59:26 +0000 (20:59 +0000)]
Merge changes I58789fdc,I74e03909,Id82f5e6d

* changes:
  Move queryTvSystemAudioModeSupport to HdmiCecLocalDeviceAudioSystem
  Add stub method for detecting System Audio Mode support
  Add HdmiAudioSystemClient

5 years agoMerge "Organize notification classes in row/stack"
Rohan Shah [Wed, 18 Jul 2018 20:45:29 +0000 (20:45 +0000)]
Merge "Organize notification classes in row/stack"

5 years agoMerge "Annotate Region with nullability annotations"
TreeHugger Robot [Wed, 18 Jul 2018 20:44:18 +0000 (20:44 +0000)]
Merge "Annotate Region with nullability annotations"

5 years agoMerge "Add a stub SystemAudioInitiationActionFromAvr"
TreeHugger Robot [Wed, 18 Jul 2018 20:31:30 +0000 (20:31 +0000)]
Merge "Add a stub SystemAudioInitiationActionFromAvr"

5 years agoExtract a FakeNativeWrapper to share between tests
Nick Chalko [Tue, 19 Jun 2018 17:17:03 +0000 (10:17 -0700)]
Extract a FakeNativeWrapper to share between tests

Change-Id: I666496132e0dcbd4b0d36eb87fc06a99f306ca93
Test: atest FrameworksServicesTests:com.android.server.hdmi
(cherry picked from commit f19f1d9f0404586945ba1492ed2d9af172fce761)

5 years ago[automerger skipped] Merge "DO NOT MERGE: Use quick_qs_total_height when QS is not...
Evan Laird [Wed, 18 Jul 2018 20:19:38 +0000 (13:19 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Use quick_qs_total_height when QS is not disabled" into pi-dev am: ca53cf7f9a
am: 08f22c1e2d  -s ours

Change-Id: I028da01c98ba1e1af460b00564849e748ce6d38d

5 years agoMerge "DO NOT MERGE: Use quick_qs_total_height when QS is not disabled" into pi-dev
Evan Laird [Wed, 18 Jul 2018 20:14:23 +0000 (13:14 -0700)]
Merge "DO NOT MERGE: Use quick_qs_total_height when QS is not disabled" into pi-dev
am: ca53cf7f9a

Change-Id: I5b324408048abe4977cd84767c8f034e4ccc56a9

5 years agoMerge "Fix migration of O DND visual effects settings"
TreeHugger Robot [Wed, 18 Jul 2018 20:06:25 +0000 (20:06 +0000)]
Merge "Fix migration of O DND visual effects settings"

5 years agoMerge "DO NOT MERGE: Use quick_qs_total_height when QS is not disabled" into pi-dev
TreeHugger Robot [Wed, 18 Jul 2018 19:58:14 +0000 (19:58 +0000)]
Merge "DO NOT MERGE: Use quick_qs_total_height when QS is not disabled" into pi-dev

5 years agoAnnotate Region with nullability annotations
Jake Wharton [Tue, 5 Jun 2018 16:50:58 +0000 (12:50 -0400)]
Annotate Region with nullability annotations

And a missing override or four.

Bug: 78245676
Test: none
Change-Id: Ib089a1e4b23ae8bd84b44b4638ee2f505ab760ba

5 years agoMerge "Fix race condition in BoundsAnimationController"
TreeHugger Robot [Wed, 18 Jul 2018 19:01:35 +0000 (19:01 +0000)]
Merge "Fix race condition in BoundsAnimationController"

5 years agoAdd a stub SystemAudioInitiationActionFromAvr
Shubang [Thu, 28 Jun 2018 17:32:22 +0000 (10:32 -0700)]
Add a stub SystemAudioInitiationActionFromAvr

Test: make;
Change-Id: Iba1fd30b83bdc7b44f319a1acd49fa2680acc599
(cherry picked from commit 88eabcab531a3c32d32b9bb2a38e3ca94a495d10)

5 years agoMove queryTvSystemAudioModeSupport to HdmiCecLocalDeviceAudioSystem
Nick Chalko [Thu, 14 Jun 2018 14:46:00 +0000 (07:46 -0700)]
Move queryTvSystemAudioModeSupport to HdmiCecLocalDeviceAudioSystem

Bug: 80297382
Test: m -j services.core framework
Change-Id: I58789fdcf5208ac334e0d696fa769527d61847cc
(cherry picked from commit ff23fbf2b33602dcccb9b1460275d2d748c6dd7e)

5 years agoAdd stub method for detecting System Audio Mode support
Nick Chalko [Wed, 13 Jun 2018 23:03:49 +0000 (16:03 -0700)]
Add stub method for detecting System Audio Mode support

Bug: 80297382
Test: m -j; stub only
Change-Id: I74e03909e00f70806e05197d66a0eb30ea4e49c8

5 years agoAdd HdmiAudioSystemClient
Shubang [Sat, 9 Jun 2018 01:30:15 +0000 (18:30 -0700)]
Add HdmiAudioSystemClient

Bug: 109949458
Test: make;
Change-Id: Id82f5e6d5fd607ec0ffe11317341a02f7357354e

5 years agoMerge "Include textclassifier info in dumpsys"
TreeHugger Robot [Wed, 18 Jul 2018 18:33:31 +0000 (18:33 +0000)]
Merge "Include textclassifier info in dumpsys"

5 years ago[automerger skipped] Merge "libmedia2_jni: use libbinder as shared library" into...
Aurimas Liutikas [Wed, 18 Jul 2018 18:26:16 +0000 (11:26 -0700)]
[automerger skipped] Merge "libmedia2_jni: use libbinder as shared library" into stage-aosp-master am: 43a71788b4  -s ours
am: 6a92823603  -s ours

Change-Id: Iafe2c8bedd83e73a00a868f8ec0bdb1a92d1e194

5 years agoOrganize notification classes in row/stack
Rohan Shah [Tue, 3 Jul 2018 00:21:04 +0000 (17:21 -0700)]
Organize notification classes in row/stack

No functional changes. Reorganized logic under either row, stack,
logging, or row/wrapper. Haven't moved all classes over since there's
some classes that create conflicts due to weird use of
package-private/protected (primarily waiting for HUN and shelf classes).

Test: built, ran, used notifications
Bug: 110802404
Change-Id: Ia2152603bdbeb12c522360193511946c843b9266

5 years ago[automerger skipped] Merge "libmedia2_jni: use libbinder as shared library" into...
Aurimas Liutikas [Wed, 18 Jul 2018 18:16:42 +0000 (11:16 -0700)]
[automerger skipped] Merge "libmedia2_jni: use libbinder as shared library" into stage-aosp-master
am: 43a71788b4  -s ours

Change-Id: Icaec5a4ab662f5bbf240ad2f21756a3a1a697cef

5 years agoMerge "libmedia2_jni: use libbinder as shared library" into stage-aosp-master
Aurimas Liutikas [Wed, 18 Jul 2018 18:06:15 +0000 (18:06 +0000)]
Merge "libmedia2_jni: use libbinder as shared library" into stage-aosp-master

5 years ago[automerger skipped] Merge "IBatteryPropertiesRegistrar: remove unused functions...
Yifan Hong [Wed, 18 Jul 2018 17:52:35 +0000 (10:52 -0700)]
[automerger skipped] Merge "IBatteryPropertiesRegistrar: remove unused functions" into stage-aosp-master am: b9fa97dff7
am: d8fe7f5796  -s ours

Change-Id: I94f76a0f575fcc36ccf9444ba4bc93c667ea3b4e

5 years agoMerge "Fix a11y cache correctness bug"
Phil Weaver [Wed, 18 Jul 2018 17:40:15 +0000 (17:40 +0000)]
Merge "Fix a11y cache correctness bug"

5 years agoMerge "IBatteryPropertiesRegistrar: remove unused functions" into stage-aosp-master
Yifan Hong [Wed, 18 Jul 2018 17:38:42 +0000 (10:38 -0700)]
Merge "IBatteryPropertiesRegistrar: remove unused functions" into stage-aosp-master
am: b9fa97dff7

Change-Id: I55e25e25612cbb11cec025ba21b6577d635f1df9

5 years ago[automerger skipped] libmedia2_jni: use libbinder as shared library
Steven Moreland [Wed, 18 Jul 2018 17:32:21 +0000 (10:32 -0700)]
[automerger skipped] libmedia2_jni: use libbinder as shared library
am: 121551621e  -s ours

Change-Id: Ic13f83bc071b31ae6f431a033596eaf376477790

5 years agoMerge "IBatteryPropertiesRegistrar: remove unused functions" into stage-aosp-master
Yifan Hong [Wed, 18 Jul 2018 17:25:51 +0000 (17:25 +0000)]
Merge "IBatteryPropertiesRegistrar: remove unused functions" into stage-aosp-master

5 years agoMerge "Annotate Point/PointF with nullability annotations"
TreeHugger Robot [Wed, 18 Jul 2018 17:23:31 +0000 (17:23 +0000)]
Merge "Annotate Point/PointF with nullability annotations"

5 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
(cherry picked from commit a192e0e31400ac5a2b9d69788c7a60a89fb6c6ed)
Merged-In: If7f8bd931dae5310eda6c230f20179418c2efa43

5 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
(cherry picked from commit a192e0e31400ac5a2b9d69788c7a60a89fb6c6ed)
Merged-In: If7f8bd931dae5310eda6c230f20179418c2efa43

5 years agoMerge "API updated for ICU4J 62.1" am: e0ec160120 am: 46c84f53a6
Fredrik Roubert [Wed, 18 Jul 2018 16:42:38 +0000 (09:42 -0700)]
Merge "API updated for ICU4J 62.1" am: e0ec160120 am: 46c84f53a6
am: edf0baea40

Change-Id: I1b1f33db8f1fd3171edbf871e87501570b4673ad

5 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

5 years agoMerge "API updated for ICU4J 62.1" am: e0ec160120
Fredrik Roubert [Wed, 18 Jul 2018 16:29:20 +0000 (09:29 -0700)]
Merge "API updated for ICU4J 62.1" am: e0ec160120
am: 46c84f53a6

Change-Id: Iea40f55aecdf1f469eeca68570087ccc66ce23c7

5 years ago[automerger skipped] Merge "[DO NOT MERGE] Do not dismiss volume dialog onAnimationEn...
eddy-sh.chen [Wed, 18 Jul 2018 16:24:19 +0000 (09:24 -0700)]
[automerger skipped] Merge "[DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is showing" am: 2e08b42aff  -s ours am: 369f587942  -s ours
am: 2958f315c5  -s ours

Change-Id: I5030d05d5953034d9253abd8b8534d40a083f7e5

5 years ago[automerger skipped] Merge "[DO NOT MERGE] Do not dismiss volume dialog onAnimationEn...
eddy-sh.chen [Wed, 18 Jul 2018 16:19:01 +0000 (09:19 -0700)]
[automerger skipped] Merge "[DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is showing" am: 2e08b42aff  -s ours
am: 369f587942  -s ours

Change-Id: Ie55857ab5d91d5ffd6d488a45f9859ec9cfbbe9f

5 years agoMerge "API updated for ICU4J 62.1"
Fredrik Roubert [Wed, 18 Jul 2018 16:18:46 +0000 (09:18 -0700)]
Merge "API updated for ICU4J 62.1"
am: e0ec160120

Change-Id: I19144ce1a0fd7d0a9781a71ebacec033a8affb19

5 years ago[automerger skipped] Merge "[DO NOT MERGE] Do not dismiss volume dialog onAnimationEn...
eddy-sh.chen [Wed, 18 Jul 2018 16:14:47 +0000 (09:14 -0700)]
[automerger skipped] Merge "[DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is showing"
am: 2e08b42aff  -s ours

Change-Id: Ia000091649425fa1d1a2895ecc6a7f0f96157337

5 years agoAnnotate Point/PointF with nullability annotations
Jake Wharton [Tue, 5 Jun 2018 16:47:13 +0000 (12:47 -0400)]
Annotate Point/PointF with nullability annotations

And a missing override or four.

Bug: 78245676
Test: none
Change-Id: I0293eaeb4ec9659b8ee09ac29351f995bb166dbc

5 years agoMerge "API updated for ICU4J 62.1"
Treehugger Robot [Wed, 18 Jul 2018 15:03:59 +0000 (15:03 +0000)]
Merge "API updated for ICU4J 62.1"

5 years agoMerge "[DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is...
Treehugger Robot [Wed, 18 Jul 2018 14:59:20 +0000 (14:59 +0000)]
Merge "[DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is showing"

5 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

5 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

5 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

5 years agoAPI updated for ICU4J 62.1
Fredrik Roubert [Tue, 5 Jun 2018 04:28:49 +0000 (21:28 -0700)]
API updated for ICU4J 62.1

- ICU 62 upgrades to Unicode 11. Add new APIs for Unicode 11.0

Bug: 109930825
Bug: 109837373
Test: make
Change-Id: I3f23bbe624a10511a613cb07fd35e8272d1461a2

5 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

5 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

5 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"

5 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

5 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"

5 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

5 years agoInclude textclassifier info in dumpsys
Tony Mak [Mon, 16 Jul 2018 12:46:29 +0000 (14:46 +0200)]
Include textclassifier info in dumpsys

Example output:
Text classifier constants=null
TextClassifierImpl:
  Model file(s):
    ModelFile { path=/data/misc/textclassifier/textclassifier.model name=textclassifier.model version=603 locales=en }
    ModelFile { path=/etc/textclassifier/textclassifier.universal.model name=textclassifier.universal.model version=6 locales=und }
    ModelFile { path=/etc/textclassifier/textclassifier.en.model name=textclassifier.en.model version=6 locales=en }
  mFallback=android.view.textclassifier.TextClassifier$1@8269b3
SystemTextClassifier:
  mFallback=android.view.textclassifier.TextClassifierImpl@72dbb70 mPackageName=android mSessionId=null isSystemTextClassifierEnabled=true
TextClassificationConstants:
  isLocalTextClassifierEnabled=true isSystemTextClassifierEnabled=true isModelDarkLaunchEnabled=false isSmartSelectionEnabled=true isSmartTextShareEnabled=true isSmartLinkifyEnabled=true isSmartSelectionAnimationEnabled=true getSuggestSelectionMaxRangeLength=10000 getClassifyTextMaxRangeLength=10000 getGenerateLinksMaxTextLength=100000 getGenerateLinksLogSampleRate=100 getEntityListDefault=[address, email, phone, url, date, datetime, flight] getEntityListNotEditable=[address, email, phone, url, date, datetime, flight] getEntityListEditable=[address, email, phone, url, date, datetime, flight]

FIXES: 111434669

Test: adb shell dumpsys textclassification
Change-Id: If0cbc290034ff51ec31fed1ce08e5bc806603549

5 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."

5 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."

5 years ago[DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is showing
eddy-sh.chen [Mon, 16 Jul 2018 06:12:04 +0000 (14:12 +0800)]
[DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is showing

Bug: 80362864
Bug: 111478851

Change-Id: Iec6e27285bf35238d378e6561896f1d0b303fa24

5 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

5 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

5 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

5 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"

5 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

5 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"

5 years agoFix race condition in BoundsAnimationController
Winson Chung [Mon, 16 Jul 2018 19:42:37 +0000 (12:42 -0700)]
Fix race condition in BoundsAnimationController

- The SfVsyncFrameCallbackProvider needs to be initialized with the
  associated handler thread's Choreographer instance.

Bug: 111465953
Test: Take a systrace and ensure the animation is running on the right
      thread

Change-Id: Ia70b09d391fd2d154e00d081cfcf0d2354e51db2

5 years agoFix a11y cache correctness bug
Phil Weaver [Tue, 17 Jul 2018 19:28:24 +0000 (12:28 -0700)]
Fix a11y cache correctness bug

If two views change, their common ancestor can send
a subtree_changed event. But the cache is dropping
events that come from views that it hasn't cached.

Now clearing the cache entirely when a node not in
the cache sends a subtree changed event, since we
don't know which nodes are descendents and which
may have changed.

I'm not thrilled with this change, since it may
degrade performance, but I want to fix the correctness
problem quickly.

Bug: 111554539
Test: atest AccessibilityCacheTest
Change-Id: Ib32d3622cddd7001663943eff71e823d21f5e500

5 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

5 years agoIBatteryPropertiesRegistrar: remove unused functions
Yifan Hong [Fri, 4 May 2018 20:48:31 +0000 (13:48 -0700)]
IBatteryPropertiesRegistrar: remove unused functions

* Remove BatteryProperties
* Remove IBatteryPropertiesListener
* Remove IBatteryPropertiesRegistrar.(un)registerListener
  functions

Test: builds
Test: boots
Bug: 68724651
Change-Id: Ic9a9d337e5cb39784db1a2745297ef985dd31653
Merged-In: Ic9a9d337e5cb39784db1a2745297ef985dd31653
(cherry picked from commit dd0e942597b51e517eb65d9ea80595d46a3e89df)

5 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

5 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"

5 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

5 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"

5 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

5 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

5 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."

5 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"

5 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

5 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

5 years agoDO NOT MERGE: Use quick_qs_total_height when QS is not disabled
Evan Laird [Tue, 17 Jul 2018 19:55:40 +0000 (15:55 -0400)]
DO NOT MERGE: 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

5 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."

5 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."

5 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

5 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

5 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"

5 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."

5 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

5 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

5 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

5 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

5 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

5 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

5 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."

5 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

5 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

5 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"

5 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

5 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

5 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

5 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

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

5 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"