Commit Graph

412259 Commits

Author SHA1 Message Date
Chandan Nath
7e5b99b37c Merge "isBackupServiceActive should not depend on whether the user is started" 2019-04-02 22:18:41 +00:00
TreeHugger Robot
d94078e8fc Merge "Osu-Login: show Sign-up failed message only for sign-up failed." 2019-04-02 22:08:41 +00:00
TreeHugger Robot
29e5ea6741 Merge "Fix ConditionVariable.block to use elapsedRealtime." 2019-04-02 21:21:48 +00:00
Jack Yu
2bcdbd1b79 Merge "Correctly support LTE carrier aggregation" 2019-04-02 21:18:04 +00:00
TreeHugger Robot
4b24efed67 Merge "OMS: rename methods to include package downgrades" 2019-04-02 21:05:40 +00:00
Jack Yu
3526539d85 Merge "Passing ServiceState as byte array into ServiceStateProvider" 2019-04-02 20:56:37 +00:00
TreeHugger Robot
452d42f517 Merge "Pick the primary color as the best color to use." 2019-04-02 20:53:39 +00:00
Michael Wachenschwanz
c2a64487ae Merge "Clarify timebase for UsageStats Api" 2019-04-02 20:52:50 +00:00
TreeHugger Robot
1c80dfa659 Merge "OMS: remove duplicate mState line from 'cmd overlay dump'" 2019-04-02 20:51:19 +00:00
Ecco Park
165bb02376 Osu-Login: show Sign-up failed message only for sign-up failed.
It still shows up even if the OSU procedure is successful.

Bug: 129356108
Test: tested with R2 AP for the failure case and success case.
Change-Id: I705532c00a3523fd0778499ec9b460dd392c6636
Signed-off-by: Ecco Park <eccopark@google.com>
2019-04-02 20:27:34 +00:00
TreeHugger Robot
bb261a3caf Merge "Fix ringtone null pointer exception" 2019-04-02 20:23:35 +00:00
Chandan Nath
4fe554ae58 isBackupServiceActive should not depend on whether the user is started
Bug: 129763613

Test: atest com.android.server.backup.TrampolineTest
Change-Id: Ia05451a4d45a14bc30353e268cb6616ceb49947e
2019-04-02 21:20:31 +01:00
Lucas Dupin
18c3f9c551 Merge "Expand NPV when bouncer is gone" 2019-04-02 20:13:41 +00:00
Jian Jin
faccd8717c Merge "Create and log atom SystemServerWatchdogOccurred, TombStoneOccurred." 2019-04-02 19:57:08 +00:00
Youming Ye
33c666d955 Fix ringtone null pointer exception
Bug: 128468578
Test: Build
Change-Id: If65f0194712c8358fdbd88e7d04478f8395a012b
2019-04-02 19:53:15 +00:00
Andrii Kulian
a2236cb932 Merge "Update Activity lifecycle documentation" 2019-04-02 19:38:44 +00:00
Daniel Nishi
c03414f6e8 Merge "Explicitly close file stream when initializing quotas." 2019-04-02 19:33:59 +00:00
Evan Laird
073b8bd24f Merge "Battery drawable powersave tweaks" 2019-04-02 19:21:46 +00:00
Joe Onorato
5da1b3dc05 Fix ConditionVariable.block to use elapsedRealtime.
System.currentTimeMillis() is NEVER okay to use to calculate a time delta.
The original spirit of this probably should have used SystemClock.uptimeMillis(),
but use SystemClock.elapsedRealtime because it's the same as
System.currentTimeMillis() in all the cases where System.currentTimeMillis() is
correct.

Test: Treehugger
Change-Id: Ib6e090425af83e7e822fb12814d87e8a37e2d2ac
2019-04-02 19:19:13 +00:00
TreeHugger Robot
7d90b419bf Merge "WifiManager: setWifiEnabled bypass for older apps" 2019-04-02 19:19:10 +00:00
Robert Snoeberger
a6684f6713 Pick the primary color as the best color to use.
Previously, the best color was picked by checking the colors
against the blacklist. The logic was for picking the best color
was broken When the blacklist was removed for
b/124180048.

Fixes: b129762944
Test: New test points added to TonalTest.java
Change-Id: Ie51806735910bb40e5e66d7baf545ea213e4a01e
2019-04-02 15:15:38 -04:00
Lucas Dupin
e465eb1be5 Merge "Fix flickering when receiving notification" 2019-04-02 18:58:08 +00:00
Mårten Kongstad
15a0ac0d76 OMS: rename methods to include package downgrades
The overlay manager service handles package upgrades and downgrades the
same way: all it cares about is a difference in versions, not if the new
version has a higher or lower value. In both cases, the same family of
methods are called: onPackageUpgrading and onPackageUpgraded.

Rename onPackageUpgrading and onPackageUpgraded to onPackageReplacing
and onPackageReplaced to better highlight that both upgrades and
downgrades are supported.

Test: atest OverlayDeviceTests OverlayHostTests
Change-Id: I04c5c550f504114c22bb30d35c9f2809194d2543
2019-04-02 18:47:31 +00:00
Mårten Kongstad
a2ff70252a OMS: remove duplicate mState line from 'cmd overlay dump'
Commit 3898834574 duplicated the mState part of the OMS dump output (by
mistake). Remove the offending line.

Test: manual (adb shell cmd overlay dump)
Change-Id: Ie5dd9e10b691e3d5b3ac1c60a3a5d01fdc17bdac
2019-04-02 11:40:17 -07:00
Jack Yu
2e273b2f0f Passing ServiceState as byte array into ServiceStateProvider
This allows the provider to reconstruct the service state
object correctly. Also we can get rid of all the 'set'
methods in ServiceState, which we'd like to remove in the future.

Test: Manual
Bug: 129768354
Change-Id: I835d30e544b3ed49d5d0b6b1ca981a81e3ee2039
2019-04-02 11:27:34 -07:00
TreeHugger Robot
a50bed00f3 Merge "SurfaceView: Correct comparison operator." 2019-04-02 18:14:53 +00:00
Tarandeep Singh
35fe4d528c Merge "Keep IME target till window is closing and not removed" 2019-04-02 18:12:23 +00:00
Jack Yu
05a6543248 Correctly support LTE carrier aggregation
NetworkRegistrationInfo.getAccessNetworkTechnology() should
report LTE as the network type when modem reports the RAT
LTE_CA. Fixed by adding a flag in data specific registration
info.

Test: Manual
Bug: 129707180
Change-Id: Ib152f97711441fded998a36528ef007f9e28ccbf
2019-04-02 11:09:43 -07:00
jianjin
8f2dee04e2 Create and log atom SystemServerWatchdogOccurred, TombStoneOccurred.
Bug: 126127632
Change-Id: I1e78069589185a4702d65cd026bc44b374a31f0a
Fix: 126127632
Test: none
2019-04-02 11:05:45 -07:00
TreeHugger Robot
d5c80f29cd Merge "Sharesheet - Give shortcut api results priority" 2019-04-02 17:53:24 +00:00
Jian Jin
ddfac31f03 Merge "Write active metrics to disk on all shutdown cases" 2019-04-02 17:44:42 +00:00
Android Build Merger (Role)
842760bd7d Merge "[automerger skipped] Merge "Convert frameworks/base/cmds/* to Android.bp" am: 179e132823 am: aa9e302a63 am: 86860a5254 -s ours am skip reason: change_id Ieb54feb3902bddfd5a571369fbf50161ae646647 with SHA1 0a2d8cbb26 is in history" 2019-04-02 17:40:17 +00:00
Colin Cross
184dc85643 [automerger skipped] Merge "Convert frameworks/base/cmds/* to Android.bp" am: 179e132823 am: aa9e302a63
am: 86860a5254 -s ours
am skip reason: change_id Ieb54feb3902bddfd5a571369fbf50161ae646647 with SHA1 0a2d8cbb26 is in history

Change-Id: Iac4445001f4ed12a5da331dc353bfa3918e22e78
2019-04-02 10:38:36 -07:00
Lei Yu
2736d4cb38 Merge "Update bt icon color" 2019-04-02 17:34:21 +00:00
Andrew Sapperstein
4e4768b989 Merge "Default enable feature flag for Safety Hub" 2019-04-02 17:32:25 +00:00
Colin Cross
86860a5254 Merge "Convert frameworks/base/cmds/* to Android.bp" am: 179e132823
am: aa9e302a63

Change-Id: I05de333caa6aa5ed6b33389e2c320d845b9a36ee
2019-04-02 10:19:15 -07:00
TreeHugger Robot
825c933351 Merge "BaseIDevicePolicyManager Q cleanup." 2019-04-02 17:14:44 +00:00
Chavi Weingarten
ace4f6a018 Merge "Remove closeTransactionSync since it's no longer used." 2019-04-02 17:12:07 +00:00
Colin Cross
aa9e302a63 Merge "Convert frameworks/base/cmds/* to Android.bp"
am: 179e132823

Change-Id: I22698f8a29dfe60b7dc1198ac62af5d59827e9d7
2019-04-02 09:59:30 -07:00
Lucas Dupin
d9c4cac4c7 Merge "Do not colorize dark mode actions" 2019-04-02 16:58:27 +00:00
Colin Cross
179e132823 Merge "Convert frameworks/base/cmds/* to Android.bp" 2019-04-02 16:39:04 +00:00
John Reck
44eaac327b Merge "Fix performance regression in textclassifier" 2019-04-02 16:38:48 +00:00
TreeHugger Robot
43aae704a4 Merge "Sharesheet - Photos -> Sharesheet in work profile crashes" 2019-04-02 16:20:23 +00:00
TreeHugger Robot
327e8720c3 Merge "Fix hotspot icon tint in Settings." 2019-04-02 16:20:19 +00:00
TreeHugger Robot
4787419234 Merge "Use system user when installing APKs." 2019-04-02 16:18:29 +00:00
Janis Danisevskis
eff37cca16 Merge "Keystore.java: Make apps tolerant to keystore crashes" 2019-04-02 16:13:15 +00:00
Janis Danisevskis
c9277ffd42 Keystore.java: Make apps tolerant to keystore crashes
Since keystore accepts asynchronous requests it may be that apps wait
forever if keystore dies. This patch adds a death recipient to all
keystore promises so that Keystore.java gets notified when keystore
dies.

Test: atest android.keystore.cts
Bug: 111443219
Bug: 128991260
Change-Id: Ie6e4a4f371287f83a2cdf4069d5686c67d8aebc1
2019-04-02 16:13:01 +00:00
Josh Tsuji
2311032149 Merge "Disable the restored at resting position test, it's being flaky." 2019-04-02 16:01:49 +00:00
Joshua Tsuji
92e7f78edc Disable the restored at resting position test, it's being flaky.
Test: disabling a test
Change-Id: I3fa36378bf93929c6e8f195d26a79ee3e2217150
2019-04-02 11:56:39 -04:00
Lucas Dupin
ad8d508d9a Merge "ClockManager listeners receive separate ClockPlugin instances." 2019-04-02 15:55:12 +00:00