OSDN Git Service

android-x86/frameworks-base.git
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 "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 11 Jul 2018 20:47:39 +0000 (20:47 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Correct buildReportAudioStatus()"
TreeHugger Robot [Wed, 11 Jul 2018 20:30:44 +0000 (20:30 +0000)]
Merge "Correct buildReportAudioStatus()"

6 years agoMerge "Reordered the params for network registration"
TreeHugger Robot [Wed, 11 Jul 2018 20:24:22 +0000 (20:24 +0000)]
Merge "Reordered the params for network registration"

6 years agoMerge "Add STREAM_VOICE_CALL to MUTE_STREAMS_AFFECTED on upgrade"
Nadav Bar [Wed, 11 Jul 2018 20:13:13 +0000 (20:13 +0000)]
Merge "Add STREAM_VOICE_CALL to MUTE_STREAMS_AFFECTED on upgrade"

6 years agoMerge "Replace SkDrawFilter with PaintFilter."
Ben Wagner [Wed, 11 Jul 2018 19:36:52 +0000 (19:36 +0000)]
Merge "Replace SkDrawFilter with PaintFilter."

6 years ago[automerger skipped] Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2" am: c1e5c3...
Nathan Harold [Wed, 11 Jul 2018 19:32:16 +0000 (12:32 -0700)]
[automerger skipped] Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2" am: c1e5c3ea82 am: 22590b06e8  -s ours
am: a35f24bc96  -s ours

Change-Id: Iac671407a301c933ab1bda0dadafcaa1573cc7d0

6 years ago[automerger skipped] Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2" am: c1e5c3ea82
Nathan Harold [Wed, 11 Jul 2018 19:19:19 +0000 (12:19 -0700)]
[automerger skipped] Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2" am: c1e5c3ea82
am: 22590b06e8  -s ours

Change-Id: Id9ad6c651594b9ed1306657ab3bcb53278a566e1

6 years agoMerge "Update Wcdma and Tdscdma CellInfo for HAL 1.2"
Nathan Harold [Wed, 11 Jul 2018 19:09:10 +0000 (12:09 -0700)]
Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2"
am: c1e5c3ea82

Change-Id: I4bbedcc3f47706d677a1c66273bf1643c8f21be5

6 years agoReordered the params for network registration
Jack Yu [Sat, 9 Jun 2018 00:27:05 +0000 (17:27 -0700)]
Reordered the params for network registration

Test: Build
Bug: 73659459
Change-Id: I1af2c49a937177173b760d30b030da20f03c01d7
(cherry picked from commit 7928c4d1c370a67be81ccb5b70696b8ef9db48ba)

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: b9ed29...
Bill Yi [Wed, 11 Jul 2018 18:00:28 +0000 (11:00 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: b9ed290b01  -s ours
am: d54b4b0a4f  -s ours

Change-Id: Idf454d7e6c0bb2b1c5e5d91620f8bfc5c5c3f114

6 years agoMerge "Update Wcdma and Tdscdma CellInfo for HAL 1.2"
Nathan Harold [Wed, 11 Jul 2018 17:58:50 +0000 (17:58 +0000)]
Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2"

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Wed, 11 Jul 2018 17:53:56 +0000 (10:53 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: b9ed290b01  -s ours

Change-Id: I2f6671ada5f0758346cd006dd9f2404b3f4a0a63

6 years agoMerge "MediaPlayer2: clean up setDataSource"
TreeHugger Robot [Wed, 11 Jul 2018 17:52:31 +0000 (17:52 +0000)]
Merge "MediaPlayer2: clean up setDataSource"

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 11 Jul 2018 17:47:36 +0000 (17:47 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Allow NotificationAssistantService to suggest smart actions"
Tony Mak [Wed, 11 Jul 2018 17:32:39 +0000 (17:32 +0000)]
Merge "Allow NotificationAssistantService to suggest smart actions"

6 years agoCorrect buildReportAudioStatus()
Shubang [Fri, 8 Jun 2018 01:30:07 +0000 (18:30 -0700)]
Correct buildReportAudioStatus()

The format doesn't match the spec (see CEC table 29) or
HdmiUtils.isAudioStatusMute() / HdmiUtils.getAudioStatusVolume()

Bug: 80297383
Test: make;
Change-Id: Ia064fa013cbc2acafe3847151b02d42a79e89388
(cherry picked from commit c2830d1317d0b312809d74a617aae8755d0b6b87)

6 years agoReplace SkDrawFilter with PaintFilter.
Ben Wagner [Thu, 28 Jun 2018 21:08:16 +0000 (17:08 -0400)]
Replace SkDrawFilter with PaintFilter.

Skia is removing SkDrawFilter.

Test: refactoring CL. Existing unit tests still pass.
Change-Id: If81c1a2feabf7d377ae1d7bcb3e8cf0f599ad3ce

6 years agoMerge "Factor our theme of permission grant dialog"
Philip P. Moltmann [Wed, 11 Jul 2018 15:58:14 +0000 (15:58 +0000)]
Merge "Factor our theme of permission grant dialog"

6 years agoMerge "Refactor RankingHelper to separate out PreferencesHelper."
Aaron Heuckroth [Wed, 11 Jul 2018 15:10:04 +0000 (15:10 +0000)]
Merge "Refactor RankingHelper to separate out PreferencesHelper."

6 years agoMerge "Clean up sync manager and fix the lock screen blocked sync issue."
Makoto Onuki [Wed, 11 Jul 2018 14:47:21 +0000 (14:47 +0000)]
Merge "Clean up sync manager and fix the lock screen blocked sync issue."

6 years agoresolve merge conflicts of 6e3c86c8ed7a1bcfcbc63bbded0043d4b4efbe10 to stage-aosp...
David Brazdil [Wed, 11 Jul 2018 12:41:55 +0000 (05:41 -0700)]
resolve merge conflicts of 6e3c86c8ed7a1bcfcbc63bbded0043d4b4efbe10 to stage-aosp-master am: f8d22dec87
am: 1efb9d2ec3

Change-Id: I284d7c4bf7aad7c50afa714be2178d678af03f92

6 years agoresolve merge conflicts of 6e3c86c8ed7a1bcfcbc63bbded0043d4b4efbe10 to stage-aosp...
David Brazdil [Wed, 11 Jul 2018 12:33:38 +0000 (05:33 -0700)]
resolve merge conflicts of 6e3c86c8ed7a1bcfcbc63bbded0043d4b4efbe10 to stage-aosp-master
am: f8d22dec87

Change-Id: Ia11c6556d55a1eab3552edcd8665969001cfb9e7

6 years agoMerge "Send interaction hint when starting window animation" into pi-dev am: 3f4232a801
Jorim Jaggi [Wed, 11 Jul 2018 12:31:55 +0000 (05:31 -0700)]
Merge "Send interaction hint when starting window animation" into pi-dev am: 3f4232a801
am: d6f00d8511

Change-Id: Iac81ceec8470a57daf9f1e29b8d75b1e68d5a2fa

6 years agoMerge "Send interaction hint when starting window animation" into pi-dev
Jorim Jaggi [Wed, 11 Jul 2018 12:22:34 +0000 (05:22 -0700)]
Merge "Send interaction hint when starting window animation" into pi-dev
am: 3f4232a801

Change-Id: Ie39b514828d7b751d4d9356e1cde32ad44485e68

6 years agoMerge "Send interaction hint when starting window animation" into pi-dev
Jorim Jaggi [Wed, 11 Jul 2018 12:10:29 +0000 (12:10 +0000)]
Merge "Send interaction hint when starting window animation" into pi-dev

6 years agoresolve merge conflicts of 6e3c86c8ed7a1bcfcbc63bbded0043d4b4efbe10 to stage-aosp...
David Brazdil [Wed, 11 Jul 2018 10:56:34 +0000 (11:56 +0100)]
resolve merge conflicts of 6e3c86c8ed7a1bcfcbc63bbded0043d4b4efbe10 to stage-aosp-master

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ide3c4e229b47e4242cacafc04b70d8b392712cc8

6 years agoAllow NotificationAssistantService to suggest smart actions
Tony Mak [Tue, 19 Jun 2018 17:30:41 +0000 (18:30 +0100)]
Allow NotificationAssistantService to suggest smart actions

Here is the flow:
NAS generates Adjustment -> NMS convert this to RankingUpdate ->
SystemUI.NotificationListener receives the RankingUpdate in either
onNotificationPosted / onNotificationRankingUpdate (Depend on does NAS
provides the adjustment before the notification is en-queued) ->
NotificationEntryManager determines the need of reinflation ->
NotificationInflater inflates / reinflates the view with these
extra bits like smart actions.

Note: We do re-inflation here as simply adding a button to the existing
notification view seems problematic. For example, if the original
notification does not have any action, we will need to inflate the
template with the action container.

Screenshot:
https://hsv.googleplex.com/5731489463402496

Test: atest SystemUITests
Test: atest com.android.server.notification.NotificationAdjustmentExtractorTest
Test: Modify ExtServices to provide adjustment in
      createEnqueuedNotificationAdjustment, post a notification with
      a entity in a sample app, observed the notification is updated.
      (Testing the onNotificationPosted flow)
Test: Modify ExtServices to provide adjustment in onNotificationPosted
      by calling adjustNotification. Post a notification with
      a entity in a sample app, observed the notification is updated.
      (Testing the onRankingUpdated flow)
Test: Repeat the above test, but explicitly make the RowInflaterTask
      slow by inserting Thread.sleep. This can test the onRankingUpdated
      flow when the row is not yet inflated.

BUG: 110527159

Change-Id: I98aee3ac62f60b189ea92ac9fc000127325dfead

6 years agoCollects binder call stats data through WestWorld.
Olivier Gaillard [Tue, 10 Jul 2018 10:25:09 +0000 (11:25 +0100)]
Collects binder call stats data through WestWorld.

We require binder calls detailed tracking to be enabled to collect the
stats (in addition to enabling it in WestWorld).

Test: unit test + manual

adb shell cmd stats pull-source 10022
Pull from 10022: { 1531240941000000000 25807560798 (10022)0x10000->0[I]
0x20000->com.android.server.StorageManagerService$3[S]
0x30000->onVolumePathChanged[S] 0x40000->1[L] 0x50000->0[L]
0x60000->18490[L] 0x70000->18490[L] 0x80000->2611[L] 0x90000->2611[L]
0xa0000->0[L]  } ...

Change-Id: I07cad5d8678426cdac45872cda028ea7a85d7d81

6 years agoMerge "Compile android.test.*.stubs into dex"
David Brazdil [Wed, 11 Jul 2018 09:18:15 +0000 (09:18 +0000)]
Merge "Compile android.test.*.stubs into dex"

6 years agoAdd STREAM_VOICE_CALL to MUTE_STREAMS_AFFECTED on upgrade
Nadav Bar [Sun, 24 Jun 2018 07:06:50 +0000 (10:06 +0300)]
Add STREAM_VOICE_CALL to MUTE_STREAMS_AFFECTED on upgrade

Update the system setting MUTE_STREAMS_AFFECTED to indicate that
STREAM_VOICE_CALL is affected by mute, as starting from P, phone apps can
mute the voice call stream as well.

Test: Tested manually that after upgrade stream can be muted.
Bug: 110398177
Change-Id: Ia20aa87525296bbf33e3f5234681427a47caaabe

6 years agoMerge changes from topic "face-settings"
Kevin Chyn [Wed, 11 Jul 2018 03:27:02 +0000 (03:27 +0000)]
Merge changes from topic "face-settings"

* changes:
  Remove unused parameter in FaceManager
  Add face metrics constants

6 years agoMerge "cleanup: correct typos and fix some warnings"
TreeHugger Robot [Wed, 11 Jul 2018 02:52:19 +0000 (02:52 +0000)]
Merge "cleanup: correct typos and fix some warnings"

6 years agoMerge "Only query for estimate on battery level change" into pi-dev am: 729bfdf9a8
Salvador Martinez [Wed, 11 Jul 2018 02:23:35 +0000 (19:23 -0700)]
Merge "Only query for estimate on battery level change" into pi-dev am: 729bfdf9a8
am: 953cfa401d

Change-Id: I1ec5976be4407cd7a605691758d00dea4f1c5422

6 years agoMerge "Mark installable jars with installable: true am: d7647c1b66 am: f367f909bb"
Android Build Merger (Role) [Wed, 11 Jul 2018 02:16:09 +0000 (02:16 +0000)]
Merge "Mark installable jars with installable: true am: d7647c1b66 am: f367f909bb"

6 years agoMark installable jars with installable: true am: d7647c1b66
Colin Cross [Wed, 11 Jul 2018 02:15:42 +0000 (19:15 -0700)]
Mark installable jars with installable: true am: d7647c1b66
am: f367f909bb

Change-Id: Iad200867b7b73b3e9e5e6c0011ef9cea3cccfdde

6 years agoMerge "Fix for incorrect cycle evaluation in computeOomAdj"
TreeHugger Robot [Wed, 11 Jul 2018 02:14:59 +0000 (02:14 +0000)]
Merge "Fix for incorrect cycle evaluation in computeOomAdj"

6 years agoMerge "Only query for estimate on battery level change" into pi-dev
Salvador Martinez [Wed, 11 Jul 2018 01:40:02 +0000 (18:40 -0700)]
Merge "Only query for estimate on battery level change" into pi-dev
am: 729bfdf9a8

Change-Id: I7a7ec3965bc19f1f62428ea0737b6263d079dd02

6 years agoMerge "Minor logging improvement."
TreeHugger Robot [Wed, 11 Jul 2018 01:14:33 +0000 (01:14 +0000)]
Merge "Minor logging improvement."

6 years agoMerge "Remove equal sign and comma from some text perf tests"
Siyamed Sinir [Wed, 11 Jul 2018 01:11:23 +0000 (01:11 +0000)]
Merge "Remove equal sign and comma from some text perf tests"

6 years agoMark installable jars with installable: true
Colin Cross [Wed, 11 Jul 2018 01:10:57 +0000 (18:10 -0700)]
Mark installable jars with installable: true
am: d7647c1b66

Change-Id: If2f6daf0457bae822d88a762ef79f0162ded6ebe

6 years agoMerge "Only query for estimate on battery level change" into pi-dev
TreeHugger Robot [Wed, 11 Jul 2018 00:43:02 +0000 (00:43 +0000)]
Merge "Only query for estimate on battery level change" into pi-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 11 Jul 2018 00:34:55 +0000 (17:34 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ice16b70aac3532e8a2ba725315868dc6d60c4fde

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 11 Jul 2018 00:14:47 +0000 (17:14 -0700)]
Import translations. DO NOT MERGE

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

6 years agoMerge "Add nullability annotations to lifecycle callbacks"
TreeHugger Robot [Tue, 10 Jul 2018 23:58:57 +0000 (23:58 +0000)]
Merge "Add nullability annotations to lifecycle callbacks"

6 years agoMinor logging improvement.
Felipe Leme [Tue, 10 Jul 2018 22:45:43 +0000 (15:45 -0700)]
Minor logging improvement.

Bug: 77271640
Test: adb logcat

Change-Id: I66de01ebe3b5c09e7ca0e6f07b962e9beeeae1f5

6 years agoOnly query for estimate on battery level change
Salvador Martinez [Wed, 4 Jul 2018 01:07:07 +0000 (18:07 -0700)]
Only query for estimate on battery level change

SysUI is querying for an estimate too much, this change gates
it on being the first estimate or the battery level having
changed so that we don't waste system resources.

Test: atest PowerUITest
Bug: 110259498
Change-Id: I6fb5c08d6388e463d6216de41b3fd49bbc489b81

6 years agoMerge "Add UrlSpanFactory to Linkify"
Siyamed Sinir [Tue, 10 Jul 2018 23:32:27 +0000 (23:32 +0000)]
Merge "Add UrlSpanFactory to Linkify"

6 years agoRemove equal sign and comma from some text perf tests
Siyamed Sinir [Tue, 10 Jul 2018 23:26:07 +0000 (16:26 -0700)]
Remove equal sign and comma from some text perf tests

Test: atest android.text.BoringLayoutCreateDrawPerfTest
Test: android.text.BoringLayoutIsBoringPerfTest
Test: android.text.StaticLayoutCreateDrawPerfTest
Test: android.text.TextViewSetTextMeasurePerfTest
Test: android.text.PaintMeasureDrawPerfTest

Bug: 111319857
Change-Id: Idb9f24cef0c829e0d7d239554463d92fe8093004

6 years agocleanup: correct typos and fix some warnings
Shubang [Tue, 5 Jun 2018 23:32:53 +0000 (16:32 -0700)]
cleanup: correct typos and fix some warnings

Test: make
Change-Id: I33e4872bd91c023dd1268ad8e2972c6096348979
(cherry picked from commit f28eede4989199d41ec780147cd50d166ab7793b)

6 years agoMerge "Adding more cec commands builder methods."
TreeHugger Robot [Tue, 10 Jul 2018 22:18:07 +0000 (22:18 +0000)]
Merge "Adding more cec commands builder methods."

6 years agoMerge "Use app ops string string when checking ops."
TreeHugger Robot [Tue, 10 Jul 2018 21:51:44 +0000 (21:51 +0000)]
Merge "Use app ops string string when checking ops."

6 years agoMark installable jars with installable: true
Colin Cross [Tue, 10 Jul 2018 21:24:31 +0000 (14:24 -0700)]
Mark installable jars with installable: true

Most jars don't need to be installed on the device.  Instead of
using java_library and java_library_static to distinguish between
them make java_library and java_library_static identical and use
installable: true to identify the few jars that need to be dexed
and installed on the device.

Bug: 110885583
Test: m checkbuild
Change-Id: I19c0e723285c7088700f50567b9c2140289f9edf

6 years agoMediaPlayer2: clean up setDataSource
Wei Jia [Tue, 10 Jul 2018 01:39:16 +0000 (18:39 -0700)]
MediaPlayer2: clean up setDataSource

Test: cts
Bug: 109928575
Change-Id: Ib50e99599e8c27c9d9c9340e0517bd81a4e6b2d2

6 years agoMerge "Add nullability annotations to state save/restoration"
TreeHugger Robot [Tue, 10 Jul 2018 21:23:12 +0000 (21:23 +0000)]
Merge "Add nullability annotations to state save/restoration"

6 years agoClean up sync manager and fix the lock screen blocked sync issue.
Makoto Onuki [Mon, 9 Jul 2018 21:29:33 +0000 (14:29 -0700)]
Clean up sync manager and fix the lock screen blocked sync issue.

- Fix the issue where when a sync starts when the user is locked, the sync
is enqueued and waits for the 10 minute timeout, which drains the battery.

Now, in this case, we finished the job right away, and if it's a non-periodic
sync, we ask the job scheduler to reschedule.

- Clean up all the mess and unnecessary code.

Fixes: 79433653
Test: manual: Add an account, remove it, make sure all the sync operations are
gone from dumpsys content.
Test: manual: Use the requestsync command while the user is locked and
make sure the sync won't stuck.

Change-Id: I8cfd6a80715336ebea3793b2ed10b59d90cd8e52

6 years agoAdding more cec commands builder methods.
Amy [Mon, 4 Jun 2018 18:42:08 +0000 (11:42 -0700)]
Adding more cec commands builder methods.

Test: make -j18.
Change-Id: Ifa2dbbdc04938d39fdb6fcd6c0fd3465a6d218d3
(cherry picked from commit 3ff06428fb25a4ea78bf9d3893e8f9851c5270d2)

6 years agoMerge "Do not commit session twice"
TreeHugger Robot [Tue, 10 Jul 2018 20:55:05 +0000 (20:55 +0000)]
Merge "Do not commit session twice"

6 years agoUpdate Wcdma and Tdscdma CellInfo for HAL 1.2
Nathan Harold [Wed, 28 Mar 2018 15:39:43 +0000 (08:39 -0700)]
Update Wcdma and Tdscdma CellInfo for HAL 1.2

In HAL 1.2 WCDMA and TDSCMA were updated to bring
them in line with the other CellInfo types. WCDMA
was missing support for Rscp and Ec/No; the former
being the primary measurement used for WCDMA signal
strength. TDSCDMA was missing support for RSSI, and
the definition for RSCP was incorrect, so it was fixed
to use the PCCPH RSCP.

Furthermore, TDSCDMA support was unavailable except
in the CellIdentity. This patch pipes support from the
HAL to the framework, adding CellInfoTdscdma, which is
primarily for Asia.

-Add RSCP and Ec/No fields to CellSignalStrengthWcdma
-Add CellInfoTdscdma and CellSignalStrengthTdscdma
-Add UARFCN and Alphas support for CellIdentityTdscdma
-Fix a bug in the equals() check for CellIdentity
-Update documentation for CellInfo<RAT> classes and
 the getLevel() methods of CellSignalStrength<RAT>

Bug: 76153768
Test: RILTests added for TDSCDMA
Merged-In: I71e0998f1a9bd7656d495003a8ee5ef616ca4f43
Change-Id: I71e0998f1a9bd7656d495003a8ee5ef616ca4f43
(cherry picked from commit 88f44024bb068829358d66107360223dc73131f7)

6 years agoMerge "Update Wcdma and Tdscdma CellInfo for HAL 1.2" into pi-dev-plus-aosp
Nathan Harold [Tue, 10 Jul 2018 20:13:09 +0000 (13:13 -0700)]
Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2" into pi-dev-plus-aosp
am: 2ac4249f8c

Change-Id: I95fb510bcb881f52dc20ff567f3e51f93b0b7290

6 years agoMerge "Update Wcdma and Tdscdma CellInfo for HAL 1.2" into pi-dev-plus-aosp
Nathan Harold [Tue, 10 Jul 2018 19:57:15 +0000 (19:57 +0000)]
Merge "Update Wcdma and Tdscdma CellInfo for HAL 1.2" into pi-dev-plus-aosp

6 years agoMerge "Revert "OOM score management""
Christopher Morin [Tue, 10 Jul 2018 19:23:19 +0000 (19:23 +0000)]
Merge "Revert "OOM score management""

6 years agoMerge "Use light theme for printSpooler"
TreeHugger Robot [Tue, 10 Jul 2018 19:08:20 +0000 (19:08 +0000)]
Merge "Use light theme for printSpooler"

6 years agoMerge "Add build rule for API->source mapping." am: b4919259ab am: 4500790a81
Mathew Inwood [Tue, 10 Jul 2018 19:02:21 +0000 (12:02 -0700)]
Merge "Add build rule for API->source mapping." am: b4919259ab am: 4500790a81
am: c47c718a3b

Change-Id: I7d35a2de0b5fe8c4fe9e4994de910b64c63da2b8

6 years agoMerge "Add build rule for API->source mapping." am: b4919259ab
Mathew Inwood [Tue, 10 Jul 2018 18:51:02 +0000 (11:51 -0700)]
Merge "Add build rule for API->source mapping." am: b4919259ab
am: 4500790a81

Change-Id: Idc214d73fcf555ac15f865cc9be60909399170f8

6 years agoMerge "Add build rule for API->source mapping."
Mathew Inwood [Tue, 10 Jul 2018 18:41:48 +0000 (11:41 -0700)]
Merge "Add build rule for API->source mapping."
am: b4919259ab

Change-Id: I616da3024e5d310ae6993b4437611cb188c8145a

6 years agoRefactor RankingHelper to separate out PreferencesHelper.
Aaron Heuckroth [Mon, 9 Jul 2018 20:26:09 +0000 (16:26 -0400)]
Refactor RankingHelper to separate out PreferencesHelper.

Test: Unit tests, manual.
Change-Id: If3d9e2a114268bd49654c271170aafb943369684

6 years agoMerge "Move channel logging to dump method and redact name."
Aaron Heuckroth [Tue, 10 Jul 2018 18:05:34 +0000 (18:05 +0000)]
Merge "Move channel logging to dump method and redact name."

6 years agoMerge "Ensure the ActionProxyReceiver runs as the system user"
Winson Chung [Tue, 10 Jul 2018 18:04:39 +0000 (18:04 +0000)]
Merge "Ensure the ActionProxyReceiver runs as the system user"

6 years ago[automerger skipped] Merge "Java side setup and access to Binder Proxy Tracking"...
Michael Wachenschwanz [Tue, 10 Jul 2018 18:01:34 +0000 (11:01 -0700)]
[automerger skipped] Merge "Java side setup and access to Binder Proxy Tracking" am: 62d5e041a2  -s ours am: ccee79d9ce  -s ours
am: 0da8f4070f  -s ours

Change-Id: I2a88beff7e14d05a1a7041c415a5863337e916ca

6 years ago[automerger skipped] Merge "Java side setup and access to Binder Proxy Tracking"...
Michael Wachenschwanz [Tue, 10 Jul 2018 17:48:55 +0000 (10:48 -0700)]
[automerger skipped] Merge "Java side setup and access to Binder Proxy Tracking" am: 62d5e041a2  -s ours
am: ccee79d9ce  -s ours

Change-Id: Ic27debc1b021a77de57e384df7dba0f1d9209df8

6 years ago[automerger skipped] Merge "Java side setup and access to Binder Proxy Tracking"
Michael Wachenschwanz [Tue, 10 Jul 2018 17:36:25 +0000 (10:36 -0700)]
[automerger skipped] Merge "Java side setup and access to Binder Proxy Tracking"
am: 62d5e041a2  -s ours

Change-Id: Ic9cbde38cded481a75ce772f91c741f39de0360f

6 years agoRevert "OOM score management"
Christopher Morin [Mon, 9 Jul 2018 21:43:45 +0000 (21:43 +0000)]
Revert "OOM score management"

This reverts commit af5451f0aca12467e2eeb4c8e14d2b6b4c7083fc.

Reason for revert: Causes b/110976005

Exempt-From-Owner-Approval: Needed to avoid a widespread breakage
Change-Id: Ibe969726601d6e4ce9a66b1bf8998cb33a955619

6 years agoMerge "Add build rule for API->source mapping."
Mathew Inwood [Tue, 10 Jul 2018 17:12:37 +0000 (17:12 +0000)]
Merge "Add build rule for API->source mapping."

6 years agoMerge "Fix NPE in makeTransformCanvas"
TreeHugger Robot [Tue, 10 Jul 2018 17:11:24 +0000 (17:11 +0000)]
Merge "Fix NPE in makeTransformCanvas"

6 years agoMerge "Mark installable jars with installable: true" am: 1035f48f61 am: 19609a7993
Colin Cross [Tue, 10 Jul 2018 16:45:03 +0000 (09:45 -0700)]
Merge "Mark installable jars with installable: true" am: 1035f48f61 am: 19609a7993
am: c7f9e053ec

Change-Id: I5934f14ced4a89fa234d75fde733aae1f102cc7a

6 years agoAdd nullability annotations to lifecycle callbacks
Jake Wharton [Tue, 10 Jul 2018 16:40:16 +0000 (12:40 -0400)]
Add nullability annotations to lifecycle callbacks

Bug: 77936892
Test: none
Change-Id: I83f5ff5c8a7955c189617eb8c489171da93fd47a

6 years agoAdd nullability annotations to state save/restoration
Jake Wharton [Tue, 10 Jul 2018 16:27:59 +0000 (12:27 -0400)]
Add nullability annotations to state save/restoration

Bug: 110513685
Test: none
Change-Id: I570f0c5430ca29972d542e523a6d83ab567b4ed1

6 years agoMerge "Mark installable jars with installable: true" am: 1035f48f61
Colin Cross [Tue, 10 Jul 2018 16:29:55 +0000 (09:29 -0700)]
Merge "Mark installable jars with installable: true" am: 1035f48f61
am: 19609a7993

Change-Id: I4a345d295633892dc97789e9db21f381420e1b5c

6 years agoMerge "Java side setup and access to Binder Proxy Tracking"
Treehugger Robot [Tue, 10 Jul 2018 16:24:47 +0000 (16:24 +0000)]
Merge "Java side setup and access to Binder Proxy Tracking"

6 years agoFix NPE in makeTransformCanvas
John Reck [Tue, 10 Jul 2018 16:14:57 +0000 (09:14 -0700)]
Fix NPE in makeTransformCanvas

Test: builds && hwuiunit passes
Change-Id: Ie728832352b3652630c11bdb3115872482f12923

6 years agoMerge "Mark installable jars with installable: true"
Colin Cross [Tue, 10 Jul 2018 16:12:46 +0000 (09:12 -0700)]
Merge "Mark installable jars with installable: true"
am: 1035f48f61

Change-Id: Ia3176e68ddd7cfdb8351b2a0ea95efc9dd94d922

6 years agoMerge "Compile android.test.*.stubs into dex"
TreeHugger Robot [Tue, 10 Jul 2018 16:02:22 +0000 (16:02 +0000)]
Merge "Compile android.test.*.stubs into dex"

6 years agoMerge "Remove AndroidRuntime::getJNIEnv() usage from libmedia2_jni"
TreeHugger Robot [Tue, 10 Jul 2018 15:57:21 +0000 (15:57 +0000)]
Merge "Remove AndroidRuntime::getJNIEnv() usage from libmedia2_jni"

6 years agoMerge "Mark installable jars with installable: true"
Colin Cross [Tue, 10 Jul 2018 14:51:50 +0000 (14:51 +0000)]
Merge "Mark installable jars with installable: true"

6 years agoMerge "Resolve codes to method names for binder call stats."
Olivier Gaillard [Tue, 10 Jul 2018 14:08:18 +0000 (14:08 +0000)]
Merge "Resolve codes to method names for binder call stats."

6 years agoCompile android.test.*.stubs into dex
David Brazdil [Thu, 28 Jun 2018 09:23:50 +0000 (10:23 +0100)]
Compile android.test.*.stubs into dex

Adjust the build rules of android.test.*.stubs packages to also
produce a jar with dex files. This will be used by the `hiddenapi`
tool to categorize the boot class path equivalents as public API.

Bug: 79409988
Test: m android.test.base.stubs ; check javalib.jar contains dex
Merged-In: I1d0850b18044c559ea4b9893d929dc45884b32c3
Change-Id: Ief28cd5e6d0cdd58f22fab751e0173ccf8c69a0c

6 years agoCompile android.test.*.stubs into dex
David Brazdil [Thu, 28 Jun 2018 09:23:50 +0000 (10:23 +0100)]
Compile android.test.*.stubs into dex

Adjust the build rules of android.test.*.stubs packages to also
produce a jar with dex files. This will be used by the `hiddenapi`
tool to categorize the boot class path equivalents as public API.

Bug: 79409988
Test: m android.test.base.stubs ; check javalib.jar contains dex
Change-Id: I1d0850b18044c559ea4b9893d929dc45884b32c3

6 years agoMerge "Be more strict about triggering notification lights" into pi-dev am: f00bfbe46e
Julia Reynolds [Tue, 10 Jul 2018 13:11:04 +0000 (06:11 -0700)]
Merge "Be more strict about triggering notification lights" into pi-dev am: f00bfbe46e
am: 89e2a45c20

Change-Id: Ieea3c2a7b4c2d7b34bcece6ac14a566f66de29a9

6 years agoMerge "Be more strict about triggering notification lights" into pi-dev
Julia Reynolds [Tue, 10 Jul 2018 13:03:42 +0000 (06:03 -0700)]
Merge "Be more strict about triggering notification lights" into pi-dev
am: f00bfbe46e

Change-Id: I6c999a970a309f7888d6157c7a17f5d0ca05e32c

6 years agoMerge "Be more strict about triggering notification lights" into pi-dev
Julia Reynolds [Tue, 10 Jul 2018 12:49:16 +0000 (12:49 +0000)]
Merge "Be more strict about triggering notification lights" into pi-dev

6 years agoResolve codes to method names for binder call stats.
Olivier Gaillard [Thu, 7 Jun 2018 17:20:10 +0000 (18:20 +0100)]
Resolve codes to method names for binder call stats.

Test: unit test

Change-Id: Ie2178e6f9ebb900251d7c9ab20587d3c01acda83

6 years agoMerge "Add a getTransactionName method to Binder." am: 079f03f584 am: 06aa142232
Olivier Gaillard [Tue, 10 Jul 2018 09:08:40 +0000 (02:08 -0700)]
Merge "Add a getTransactionName method to Binder." am: 079f03f584 am: 06aa142232
am: 0600f8d76f

Change-Id: I9c86300654d3ecd9ea745b7997ed35f605452e9d

6 years agoMerge "Add a getTransactionName method to Binder." am: 079f03f584
Olivier Gaillard [Tue, 10 Jul 2018 08:59:32 +0000 (01:59 -0700)]
Merge "Add a getTransactionName method to Binder." am: 079f03f584
am: 06aa142232

Change-Id: I4695382d0c3e6489428a3178326630c655c3f0d5

6 years agoMerge "Add a getTransactionName method to Binder."
Olivier Gaillard [Tue, 10 Jul 2018 08:50:30 +0000 (01:50 -0700)]
Merge "Add a getTransactionName method to Binder."
am: 079f03f584

Change-Id: Ie157d490cf074d5b015406cb9739366cc4d46b87

6 years agoAdd build rule for API->source mapping.
Mathew Inwood [Fri, 22 Jun 2018 14:30:02 +0000 (15:30 +0100)]
Add build rule for API->source mapping.

This is used to get source positions of all class members in the boot
class path, to automate the addition of annotations. See
go/hidden-api-annotations for more context.

Mappings printed in:
out/soong/.intermediates/frameworks/base/hiddenapi-mappings
    /android_common/dex-mapping.txt

Test: make hiddenapi-mappings
Bug: 110868826
Change-Id: Ie67a8be6a5a71447a25d081bd466b8b5e01b0725

6 years agoMerge "Fix the lost RAM calculation"
Nandana Dutt [Tue, 10 Jul 2018 08:13:12 +0000 (08:13 +0000)]
Merge "Fix the lost RAM calculation"

6 years agoMerge "Add a getTransactionName method to Binder."
Olivier Gaillard [Tue, 10 Jul 2018 07:23:14 +0000 (07:23 +0000)]
Merge "Add a getTransactionName method to Binder."

6 years agoMerge "Preparation task for Settings Fragment Migration"
TreeHugger Robot [Tue, 10 Jul 2018 05:14:25 +0000 (05:14 +0000)]
Merge "Preparation task for Settings Fragment Migration"

6 years agoMerge "Add handlers for more cec commands into HdmiCecLocalDevice."
TreeHugger Robot [Tue, 10 Jul 2018 02:45:25 +0000 (02:45 +0000)]
Merge "Add handlers for more cec commands into HdmiCecLocalDevice."