OSDN Git Service
Kweku Adams [Thu, 12 Apr 2018 10:08:37 +0000 (03:08 -0700)]
Merge "Cleaning up frameworks protos." into pi-dev
am:
4738c7d0ab
Change-Id: Iea2b8f24189b805a846044cd14d978e0a50f8e90
TreeHugger Robot [Thu, 12 Apr 2018 09:55:45 +0000 (09:55 +0000)]
Merge "Cleaning up frameworks protos." into pi-dev
Milo Sredkov [Thu, 12 Apr 2018 08:06:13 +0000 (01:06 -0700)]
Merge "Allow extra height for the smartreply buttons" into pi-dev
am:
85678bfbbd
Change-Id: I4a0548757f366a24113bea9aaa70ae0d6f53db12
Andreas Gampe [Thu, 12 Apr 2018 07:56:11 +0000 (00:56 -0700)]
Merge "Revert "Greylist methods with varargs and intrinsics"" into pi-dev
am:
5ca4d29089
Change-Id: Ibfcf1acc4eeb5cd3c54442a488bede564c5e800e
Milo Sredkov [Thu, 12 Apr 2018 07:51:54 +0000 (07:51 +0000)]
Merge "Allow extra height for the smartreply buttons" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 07:40:37 +0000 (07:40 +0000)]
Merge "Revert "Greylist methods with varargs and intrinsics"" into pi-dev
Sungsoo Lim [Thu, 12 Apr 2018 07:02:42 +0000 (00:02 -0700)]
Merge "Fix possible NPE in MediaSessionManager" into pi-dev
am:
ed01dfba3e
Change-Id: I23892e1e97ef5dee8536164a14c8dd671696a0ef
TreeHugger Robot [Thu, 12 Apr 2018 06:51:52 +0000 (06:51 +0000)]
Merge "Fix possible NPE in MediaSessionManager" into pi-dev
Chen Xu [Thu, 12 Apr 2018 06:28:58 +0000 (23:28 -0700)]
Merge "Change getGroupIdLevel1() to use subId from TelephonyManager Instance" am:
18fe1cb2e1
am:
a8df607460
Change-Id: Ib48d542e98f40392949e27bf884ba67a1c800f7a
Kevin Chyn [Thu, 12 Apr 2018 06:20:09 +0000 (23:20 -0700)]
Merge "Use a protected receiver for the keyguard delayed actions" into pi-dev
am:
08d79be6bd
Change-Id: Ie932cc3972ca2a77bffe2da26c3786183f81b591
TreeHugger Robot [Thu, 12 Apr 2018 06:09:53 +0000 (06:09 +0000)]
Merge "Use a protected receiver for the keyguard delayed actions" into pi-dev
Andreas Gampe [Thu, 12 Apr 2018 05:35:24 +0000 (05:35 +0000)]
Revert "Greylist methods with varargs and intrinsics"
This reverts commit
d45ff00f1c54216c744365271748ddd81c6b9941.
Reason for revert: Breaks ART tests
Bug:
64382372
Change-Id: Ief87608ff2ad6d11b2aff5d4b9f15b953351360a
Test: none
Chen Xu [Thu, 12 Apr 2018 05:33:12 +0000 (22:33 -0700)]
Merge "Change getGroupIdLevel1() to use subId from TelephonyManager Instance"
am:
18fe1cb2e1
Change-Id: Ia69e1183fbc9b115c0514c33afe0d235eafd9c32
Jeff Sharkey [Thu, 12 Apr 2018 04:49:58 +0000 (21:49 -0700)]
Merge "Fix broken target SDK checks." into pi-dev
am:
aab3304a22
Change-Id: Ib43fd6704d6982104f11504b3d43db9edcfa9d41
TreeHugger Robot [Thu, 12 Apr 2018 04:40:06 +0000 (04:40 +0000)]
Merge "Fix broken target SDK checks." into pi-dev
Chen Xu [Thu, 12 Apr 2018 04:30:18 +0000 (04:30 +0000)]
Merge "Change getGroupIdLevel1() to use subId from TelephonyManager Instance"
Brad Stenning [Thu, 12 Apr 2018 03:28:00 +0000 (20:28 -0700)]
Merge "Allow more flexibility for icon selection" into pi-dev
am:
2e79c79ecd
Change-Id: I361d29c828f92ee7defe19d771d03e042216fa98
TreeHugger Robot [Thu, 12 Apr 2018 03:16:15 +0000 (03:16 +0000)]
Merge "Allow more flexibility for icon selection" into pi-dev
Phil Weaver [Thu, 12 Apr 2018 03:15:20 +0000 (20:15 -0700)]
Merge "Move accessibilityHeader from TextView to View" into pi-dev
am:
99a238adf1
Change-Id: I126e03f378abc0cc9554069f0af10bd6f003081a
Phil Weaver [Thu, 12 Apr 2018 03:07:57 +0000 (03:07 +0000)]
Merge "Move accessibilityHeader from TextView to View" into pi-dev
Matthew Ng [Thu, 12 Apr 2018 02:55:45 +0000 (19:55 -0700)]
Merge "Update nav buttons current view after inflates occur" into pi-dev
am:
3fb64f7f57
Change-Id: I450a4e17d12d871d5f0622110e29ceb49fbc83c3
TreeHugger Robot [Thu, 12 Apr 2018 02:46:26 +0000 (02:46 +0000)]
Merge "Update nav buttons current view after inflates occur" into pi-dev
Lei Yu [Thu, 12 Apr 2018 02:39:02 +0000 (19:39 -0700)]
Merge changes Idb4d304e,I65a7387a into pi-dev
am:
e16d4a8da1
Change-Id: Ied73f75aad11833467efc79fada6710ed3279cea
Beverly [Thu, 12 Apr 2018 02:30:55 +0000 (19:30 -0700)]
Merge "Don't launch activities from statusbar if running" into pi-dev
am:
3822490b82
Change-Id: Ided3d95e865a1c1bcb6726bfaba0fad25f6ff27b
TreeHugger Robot [Thu, 12 Apr 2018 02:28:28 +0000 (02:28 +0000)]
Merge changes Idb4d304e,I65a7387a into pi-dev
* changes:
Add metrics for battery settings
Add new metric for anomaly been ignored
TreeHugger Robot [Thu, 12 Apr 2018 02:19:17 +0000 (02:19 +0000)]
Merge "Don't launch activities from statusbar if running" into pi-dev
Daichi Hirono [Thu, 12 Apr 2018 02:15:40 +0000 (19:15 -0700)]
Merge "Fix NPE when calling Session#add" into pi-dev
am:
8b7f7f1aa5
Change-Id: Ibe98f60804d9e4945b11871f5bd5a817f800cd07
Maurice Lam [Thu, 12 Apr 2018 02:10:43 +0000 (19:10 -0700)]
Merge "Match language picker section header side padding" into pi-dev
am:
dcec75aa05
Change-Id: I9feed5709511995c8dcca9caf38b0a11eb237891
Jean-Michel Trivi [Thu, 12 Apr 2018 02:05:55 +0000 (19:05 -0700)]
Merge "PlayerBase: fix deadlock" into pi-dev
am:
437b252c96
Change-Id: Id4e59bb6ded89c96ab5f497760880fcd43a85836
TreeHugger Robot [Thu, 12 Apr 2018 01:57:20 +0000 (01:57 +0000)]
Merge "Fix NPE when calling Session#add" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 01:52:56 +0000 (01:52 +0000)]
Merge "Match language picker section header side padding" into pi-dev
Kweku Adams [Thu, 12 Apr 2018 01:51:30 +0000 (18:51 -0700)]
Merge "Fixing typo in proto field." into pi-dev
am:
ce9fe591ac
Change-Id: I9c68584be1158cd86c68f79ebb8fba6141a58120
TreeHugger Robot [Thu, 12 Apr 2018 01:46:52 +0000 (01:46 +0000)]
Merge "PlayerBase: fix deadlock" into pi-dev
goneil [Thu, 12 Apr 2018 01:45:27 +0000 (18:45 -0700)]
Merge "Differentiate Sim App Dialog layout for AOSP" into pi-dev
am:
1dfd9c8167
Change-Id: Ica533e245881f6132bcdc1bd09689cc44eb5b329
Makoto Onuki [Thu, 12 Apr 2018 01:39:53 +0000 (18:39 -0700)]
Merge "Add stats logging to ServiceManager and NPMS" into pi-dev
am:
a26e755900
Change-Id: Ib0bd9ecc183b1b2c9a6785554e6f717744820da3
TreeHugger Robot [Thu, 12 Apr 2018 01:33:01 +0000 (01:33 +0000)]
Merge "Fixing typo in proto field." into pi-dev
Chen Xu [Thu, 12 Apr 2018 01:30:01 +0000 (18:30 -0700)]
Merge "Change getGroupIdLevel1() to use subId from TelephonyManager Instance" into pi-dev
am:
1be0392273
Change-Id: I89b46de2f70ca8a33eb57bc3ddf7c4a8c41d1034
Kweku Adams [Thu, 12 Apr 2018 01:23:02 +0000 (18:23 -0700)]
Merge "Turning print proto dump back on." into pi-dev
am:
4e0fc234d9
Change-Id: Icc19e73d52f13535931c2727042cdb916198f1f5
TreeHugger Robot [Thu, 12 Apr 2018 01:20:40 +0000 (01:20 +0000)]
Merge "Differentiate Sim App Dialog layout for AOSP" into pi-dev
Matthew Ng [Thu, 12 Apr 2018 01:13:56 +0000 (18:13 -0700)]
Update nav buttons current view after inflates occur
Made sure that after nav buttons are inflated that the current view is
set immediately so that when using getCurrentView() you may not get an
older view (that could cause issues). Fixes the inability to quick scrub
because the getCurrentView() returned an old view that was detached from
parent and it's position was wrong not allowing home button to be
dragged.
Change-Id: Ia9ef61712298d0391b6479ee14d6410ca6d3f980
Fixes:
77909224
Test: wipe phone and try quick scrub
TreeHugger Robot [Thu, 12 Apr 2018 01:13:07 +0000 (01:13 +0000)]
Merge "Add stats logging to ServiceManager and NPMS" into pi-dev
fionaxu [Wed, 11 Apr 2018 19:47:46 +0000 (12:47 -0700)]
Change getGroupIdLevel1() to use subId from TelephonyManager Instance
Bug:
77905912
Test: Build
Change-Id: I720971ce115147b994e27611a0dcf052989180ec
(cherry picked from commit
272e8cf87e3aa780d7b83c021b859fdfc396f9d8)
Merged-in:
272e8cf87e3aa780d7b83c021b859fdfc396f9d8
Sudheer Shanka [Thu, 12 Apr 2018 01:05:38 +0000 (18:05 -0700)]
Merge "Update timeout log from Slog.wtf() to Slog.w()." into pi-dev
am:
092031d623
Change-Id: Ia534b0d77dd544aa360cd8f69fadccdd20516036
Lei Yu [Wed, 11 Apr 2018 22:45:31 +0000 (15:45 -0700)]
Add metrics for battery settings
1. ACTION_TIP_OPEN_BATTERY_SAVER_PAGE
2. FIELD_APP_VERSION_CODE
Bug:
77919142
Bug:
77874407
Test: Build
Change-Id: Idb4d304e9c6b078b083871d8b787fea39480c062
Chen Xu [Thu, 12 Apr 2018 01:02:21 +0000 (01:02 +0000)]
Merge "Change getGroupIdLevel1() to use subId from TelephonyManager Instance" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 01:02:17 +0000 (01:02 +0000)]
Merge "Turning print proto dump back on." into pi-dev
Michael Wright [Thu, 12 Apr 2018 00:56:45 +0000 (17:56 -0700)]
Merge "Add API to compute charge time remaining." into pi-dev
am:
ba6f173cb1
Change-Id: Ic2c23a0b22282a2bbea31ec004c58e2d686d2868
Kevin Chyn [Wed, 11 Apr 2018 19:55:45 +0000 (12:55 -0700)]
Use a protected receiver for the keyguard delayed actions
Fixes:
33281221
Test: keyguard locks after the timeout
Test: with test app using code from comment #1, see the following logs
BroadcastQueue: Permission Denial: broadcasting Intent { act=com.android.internal.policy.impl.PhoneWindowManager.DELAYED_KEYGUARD
Change-Id: I8b6abbc63965a5f0b24a82949ba1925f420a1454
Kevin Chyn [Thu, 12 Apr 2018 00:51:34 +0000 (17:51 -0700)]
Merge "Fix FingerprintDialogView when show is called before animation is complete" into pi-dev
am:
74ebf9a87c
Change-Id: I8d042491ca867ac2f2e2f213f50bf5fa90a0c961
Sudheer Shanka [Thu, 12 Apr 2018 00:47:23 +0000 (00:47 +0000)]
Merge "Update timeout log from Slog.wtf() to Slog.w()." into pi-dev
Kevin Chyn [Thu, 12 Apr 2018 00:46:17 +0000 (17:46 -0700)]
Merge "Fix FingerprintService package comparison" into pi-dev
am:
3535a0a64c
Change-Id: I282f53a8399128ecb35fc6894b1914a149d98f8e
TreeHugger Robot [Thu, 12 Apr 2018 00:27:53 +0000 (00:27 +0000)]
Merge "Add API to compute charge time remaining." into pi-dev
Jean-Michel Trivi [Tue, 10 Apr 2018 21:06:07 +0000 (14:06 -0700)]
PlayerBase: fix deadlock
Source of deadlock between PlayerBase.mLock and
PlaybackActivityMonitor.mPlayerLock:
android.media.MediaPlayer.release()
> android.media.PlayerBase.baseRelease()
> synchronized (mLock)
> com.android.server.audio.PlaybackActivityMonitor.releasePlayer()
> synchronized(mPlayerLock)
and:
com.android.server.audio.PlaybackActivityMonitor.unmutePlayersForCall()
> synchronized (mPlayerLock)
> android.media.PlayerProxy.setVolume()
> android.media.PlayerBase$IPlayerWrapper.setVolume()
> android.media.PlayerBase.baseSetVolume()
> synchronized (mLock)
playerSetVolume()
Since system_server can have its own players, the calls to
AudioService from PlayerBase can be synchronous, hence the
deadlock.
The fix consists in never holding the lock in PlayerBase
while calling into AudioService.
Refactor the playstate update into a method used for
start / stop / pause.
Bug:
72294559
Test: see bug
Change-Id: I6451aa3bf19a0365472ba007b116a9e6151ab33e
TreeHugger Robot [Thu, 12 Apr 2018 00:17:27 +0000 (00:17 +0000)]
Merge "Fix FingerprintDialogView when show is called before animation is complete" into pi-dev
Jovana Knezevic [Thu, 12 Apr 2018 00:17:26 +0000 (17:17 -0700)]
Merge "Fixes clicking on foreground user in the switcher." into pi-dev
am:
a153811ad1
Change-Id: I3b7a6f0e6d8c62661ae7aa758207379173454bac
TreeHugger Robot [Thu, 12 Apr 2018 00:16:55 +0000 (00:16 +0000)]
Merge "Fix FingerprintService package comparison" into pi-dev
Jovana Knezevic [Thu, 12 Apr 2018 00:01:11 +0000 (00:01 +0000)]
Merge "Fixes clicking on foreground user in the switcher." into pi-dev
Kweku Adams [Fri, 30 Mar 2018 19:19:58 +0000 (12:19 -0700)]
Cleaning up frameworks protos.
Note: It is currently only safe to renumber the fields because we have
not started using them yet.
* animationadapter: added in http://ag/
3709688, but was not following
the indentation policy or the unit naming policy. The durations that
have documentation in
frameworks/base/services/core/java/com/android/server/wm/ state that
they're in milliseconds. These durations didn't have documentation, but
I'm assuming they're in the same units.
* batterystats: was not following the indentation policy
* jobscheduler: AppIdleController was removed in http://ag/
3699210 and
the proto was only partially updated
* powermanagerservice: BatterySaverStateMachineProto added in
http://ag/
3763026 but was not privacy tagged and the indentation was off
* surfaceanimator: was not following the indentation policy
* remote_animation_target: was not following the indentation policy
* others: weren't following the indentation policy
Bug:
74975371
Test: flash device and run 'test CtsIncidentHostTestCases'
Change-Id: Id012f4690b1d58816fef096523e1a0ea2bccadb0
Suprabh Shukla [Wed, 11 Apr 2018 23:54:52 +0000 (16:54 -0700)]
Merge "Updating strings for activity interceptor dialog" into pi-dev
am:
3e5b5076a2
Change-Id: Ifedcc426f81670c705408f01638c69a761044dff
TreeHugger Robot [Wed, 11 Apr 2018 23:39:46 +0000 (23:39 +0000)]
Merge "Updating strings for activity interceptor dialog" into pi-dev
Makoto Onuki [Wed, 11 Apr 2018 20:51:02 +0000 (13:51 -0700)]
Add stats logging to ServiceManager and NPMS
ServiceManager:
- Do an event log every N getService() calls with total time spent
in getService().
where N = 100 for core UIDs and 200 for other apps.
- Do an event log if getService() takes longer than N ms.
where N = 10 for core UIDs and 50 for other apps.
... with some extra throttling.
NPMS:
- Do the basic "stats logger" log for updateNetworkEnabledNL() and
isUidNetworkingBlocked()
This CL also enhances StatsLogegr so it now can show the slowest call
and the max # of calls per-second.
Bug:
77853238
Test: Manual test:
- Insert a SIM card
- Set data limit
- toggle airplane mode
- toggle wifi
- toggle mobile data
Then
- "dumpsys netpolicy" and "dumpsys activity processes" and check the stats
- also check "adb logcat -b all | grep ' service_manager'"
Change-Id: I5789541063f95d0eac501189816c8604a4571ba0
Kweku Adams [Tue, 10 Apr 2018 00:35:32 +0000 (17:35 -0700)]
Fixing typo in proto field.
Bug:
72814439
Bug:
74975371
Test: atest CtsIncidentHostTestCases:com.android.server.cts.UsbIncidentTest
Change-Id: Ia04c13b96bd1996e6e96f9b4e2e693af4cb97070
Jeff Sharkey [Wed, 11 Apr 2018 23:14:26 +0000 (16:14 -0700)]
Merge "APIs to disable data usage notifications." into pi-dev
am:
f0b9fbebc0
Change-Id: I7b5bd380f00b6e94da79f43b354ecfc52df3f8e4
Android Build Merger (Role) [Wed, 11 Apr 2018 23:05:37 +0000 (23:05 +0000)]
Merge "Merge "Only show mobile data turn off dialog once." into pi-dev am:
cb87872137" into pi-dev-plus-aosp
TreeHugger Robot [Wed, 11 Apr 2018 23:05:03 +0000 (23:05 +0000)]
Merge "APIs to disable data usage notifications." into pi-dev
Amin Shaikh [Wed, 11 Apr 2018 23:04:56 +0000 (16:04 -0700)]
Merge "Only show mobile data turn off dialog once." into pi-dev
am:
cb87872137
Change-Id: Ic71adc13f67d84beee0caab59103235b3e430200
Erik Kline [Wed, 11 Apr 2018 23:04:47 +0000 (16:04 -0700)]
[automerger skipped] Merge "Don't unnecessarily reevaluate tethering provisioning" am:
f0e598b550
am:
5dea720c45 -s ours
Change-Id: I876420f3afb2a0aade2d2639d7587113f6302b86
Lei Yu [Tue, 10 Apr 2018 17:52:08 +0000 (10:52 -0700)]
Add new metric for anomaly been ignored
Bug:
77477987
Test: Build
Change-Id: I65a7387a7d0456a5d3605d91c421329d15a296aa
Erik Kline [Wed, 11 Apr 2018 22:57:24 +0000 (15:57 -0700)]
Merge "Don't unnecessarily reevaluate tethering provisioning"
am:
f0e598b550
Change-Id: Iba76e0fea962ca738160f6cbbaa31b66465bdfcc
Kweku Adams [Wed, 11 Apr 2018 22:55:01 +0000 (15:55 -0700)]
Merge "Updating BatteryStats to account for Ambient Display sipper." into pi-dev
am:
5d9498a62c
Change-Id: Id2a3bb41586790366a945946bbb3326a4c7de142
TreeHugger Robot [Wed, 11 Apr 2018 22:50:51 +0000 (22:50 +0000)]
Merge "Only show mobile data turn off dialog once." into pi-dev
Maurice Lam [Wed, 11 Apr 2018 22:48:49 +0000 (15:48 -0700)]
Match language picker section header side padding
Use listPreferredItemPaddingStart/End theme attributes to make sure
they are the same as the paddings of the language items themselves.
Test: Manual
Bug:
77884900
Change-Id: I91d52878ace499889ab9b6ac35e13500aaeacd46
Jovana Knezevic [Wed, 11 Apr 2018 22:48:45 +0000 (15:48 -0700)]
Merge "Adds user broadcasts to UserManagerHelper." into pi-dev
am:
ccb8eb3858
Change-Id: I22c968bfa6f1f70c175f04c5b2bd15f8509ed002
Michael Wright [Wed, 11 Apr 2018 22:06:36 +0000 (23:06 +0100)]
Add API to compute charge time remaining.
This is so unbundled applications (e.g. dreams) can present a charge
time indicator that is in sync with the rest of the system.
Bug:
77919650
Test: manual
Change-Id: I7d62dea4fd49eb173b4f052a0fc36f4e7ce5b6bb
Allen Webb [Wed, 11 Apr 2018 22:43:44 +0000 (15:43 -0700)]
Merge "keystore: Add documentation for user presence required." into pi-dev
am:
01cdfc4996
Change-Id: I94df735709041b182b3e1cde929d61c9d16cf6c0
jovanak [Tue, 10 Apr 2018 22:14:50 +0000 (15:14 -0700)]
Fixes clicking on foreground user in the switcher.
When foreground user is clicked, keyguard should be dismissed. If other user is clicked, we should switch to that user.
Bug:
77653809
Bug:
77808082
Test: Switcher tested in emulator and mojave by clicking on foreground and non-foreground users.
Change-Id: I72e56f8e157419ea05f155be647c11e6d98bde2c
Chet Haase [Wed, 11 Apr 2018 22:38:23 +0000 (15:38 -0700)]
Merge "Add targetSdk check around new LinearLayout weighted measure behavior" into pi-dev
am:
f24335ec85
Change-Id: I6a3d25fc7b4c03be19847fa988f6119d1eb5e1bc
Mihai Popa [Wed, 11 Apr 2018 22:33:51 +0000 (15:33 -0700)]
Merge "[Magnifier-39] Hide both handles on overlap" into pi-dev
am:
aeed443b5b
Change-Id: I66773f70d0ec5ec4923215c3aa4b59894a1f2890
TreeHugger Robot [Wed, 11 Apr 2018 22:28:17 +0000 (22:28 +0000)]
Merge "Updating BatteryStats to account for Ambient Display sipper." into pi-dev
Mihai Popa [Wed, 11 Apr 2018 22:27:59 +0000 (15:27 -0700)]
Merge "Fix ripple effect for floating toolbar menu items" into pi-dev
am:
6afcf2fb4d
Change-Id: Ic94b1ca619219268a1af233b61cc8df1f380c980
Jovana Knezevic [Wed, 11 Apr 2018 22:20:33 +0000 (22:20 +0000)]
Merge "Adds user broadcasts to UserManagerHelper." into pi-dev
Allen Webb [Wed, 11 Apr 2018 22:19:28 +0000 (22:19 +0000)]
Merge "keystore: Add documentation for user presence required." into pi-dev
Jovana Knezevic [Wed, 11 Apr 2018 22:18:24 +0000 (15:18 -0700)]
Merge "Separates current process user and foreground user" into pi-dev
am:
a512d304ca
Change-Id: Id876cfb4c06ffae5f2268fb53a6cfaddfd15bd4d
Chet Haase [Wed, 11 Apr 2018 22:17:44 +0000 (22:17 +0000)]
Merge "Add targetSdk check around new LinearLayout weighted measure behavior" into pi-dev
Mihai Popa [Wed, 11 Apr 2018 22:15:35 +0000 (22:15 +0000)]
Merge "[Magnifier-39] Hide both handles on overlap" into pi-dev
Mihai Popa [Wed, 11 Apr 2018 22:14:51 +0000 (22:14 +0000)]
Merge "Fix ripple effect for floating toolbar menu items" into pi-dev
Jeff Sharkey [Tue, 10 Apr 2018 18:38:29 +0000 (12:38 -0600)]
APIs to disable data usage notifications.
Certain carriers have requested the ability to disable the warning,
limit, and rapid data usage notifications shown by the OS, so give
them that ability on a per-subId basis. (The notifications are still
enabled by default.)
Unhide NOT_CONGESTED to match setSubscriptionOverrideCongested().
Fix bug in getPrimarySubscriptionPlanLocked() to find the first
currently active plan; the first non-recurring plan may be no longer
active. Fix bug in SubscriptionPlan which allowed invalid negative
or zero-length Period objects.
Bug:
77851691,
77506882,
77662747
Test: atest com.android.server.NetworkPolicyManagerServiceTest
Test: atest android.telephony.cts.SubscriptionManagerTest
Exempt-From-Owner-Approval: SDK deadline, responding to API feedback
Change-Id: Ib6e6dbadd5022937c3f0661ab4b66aa617f0b5af
Jovana Knezevic [Wed, 11 Apr 2018 22:06:15 +0000 (22:06 +0000)]
Merge "Separates current process user and foreground user" into pi-dev
Beverly [Wed, 11 Apr 2018 21:17:24 +0000 (17:17 -0400)]
Don't launch activities from statusbar if running
Added FLAG_ACTIVITY_SINGLE_TOP when starting activities launched
from the StatusBar. If the activity is already running
at the top of the history stack, then don't relaunch.
Fixes:
77335366
Test: manual (click "Manage notifications" from notification shade,
then trigger it again - no issues)
Change-Id: I2e9ce2c57544c3066dc4fa0cc9662f0aa85565ab
Tracy Zhou [Wed, 11 Apr 2018 21:49:22 +0000 (14:49 -0700)]
Merge "Update the recents onboarding UI to the latest mock." into pi-dev
am:
68e4c45eed
Change-Id: I0e4a58951718d2522ba4f181e8f329460d1f1b9c
Treehugger Robot [Wed, 11 Apr 2018 21:47:53 +0000 (21:47 +0000)]
Merge "Don't unnecessarily reevaluate tethering provisioning"
Rohan Shah [Wed, 11 Apr 2018 21:44:19 +0000 (14:44 -0700)]
Merge "[QS] Update mobile tile secondary text" into pi-dev
am:
497bc2cbe9
Change-Id: Ice200394d0acf6168da955442cc1ada308c181f7
Jeff Sharkey [Wed, 11 Apr 2018 21:38:27 +0000 (14:38 -0700)]
Merge "Lint to identify "deprecated at birth" APIs." into pi-dev
am:
992f6120c0
Change-Id: I0f734d9a3d6746d5d828919b74d2603eba0bcf02
TreeHugger Robot [Wed, 11 Apr 2018 21:36:31 +0000 (21:36 +0000)]
Merge "Update the recents onboarding UI to the latest mock." into pi-dev
goneil [Mon, 9 Apr 2018 23:03:41 +0000 (16:03 -0700)]
Differentiate Sim App Dialog layout for AOSP
Final Sim App Dialog layout for AOSP.
Added string lengths.
Bug:
72511181
Change-Id: Ia840d279f6c06ba86f63cbcadf36f2ed597547c7
Test: Local build and install.
TreeHugger Robot [Wed, 11 Apr 2018 21:29:20 +0000 (21:29 +0000)]
Merge "[QS] Update mobile tile secondary text" into pi-dev
fionaxu [Wed, 11 Apr 2018 19:47:46 +0000 (12:47 -0700)]
Change getGroupIdLevel1() to use subId from TelephonyManager Instance
Bug:
77905912
Test: Build
Change-Id: I720971ce115147b994e27611a0dcf052989180ec
Jeff Sharkey [Wed, 11 Apr 2018 21:25:51 +0000 (21:25 +0000)]
Merge "Lint to identify "deprecated at birth" APIs." into pi-dev
Philip P. Moltmann [Wed, 11 Apr 2018 20:54:01 +0000 (13:54 -0700)]
Merge "Properly disconnect after skipping an operation." into pi-dev
am:
cd7a174c59
Change-Id: Ida1308d4746001e818177bf6cdbfa0ec85a2afe2
TreeHugger Robot [Wed, 11 Apr 2018 20:44:32 +0000 (20:44 +0000)]
Merge "Properly disconnect after skipping an operation." into pi-dev