OSDN Git Service
Julia Reynolds [Thu, 12 Apr 2018 16:56:43 +0000 (09:56 -0700)]
Merge "Pre P apps can't change new fields" into pi-dev
am:
c11cb1b151
Change-Id: I9f09a5932de931dc8e7414f9dcd57b89a121d82c
TreeHugger Robot [Thu, 12 Apr 2018 16:40:37 +0000 (16:40 +0000)]
Merge "Pre P apps can't change new fields" into pi-dev
Android Build Merger (Role) [Thu, 12 Apr 2018 16:25:27 +0000 (16:25 +0000)]
Merge "Merge "Add min_ce/max_ce parameters to requestLeConnectionUpdate()" am:
0980006a2a am:
cb3222d662" into pi-dev-plus-aosp
Jason Monk [Thu, 12 Apr 2018 16:24:54 +0000 (09:24 -0700)]
Merge "Revert "Clear out tuner prefs since it is disabled"" into pi-dev
am:
d532ff3397
Change-Id: I8287fec3a1cc321b1c1a27046b03354725dcd2b9
Tony Mak [Thu, 12 Apr 2018 16:19:58 +0000 (09:19 -0700)]
Merge "Check in the new work profile icon" into pi-dev
am:
be0f2a49e2
Change-Id: I1a2783915700cc938a850ae4283c64e29c97e329
Stanley Tng [Thu, 12 Apr 2018 16:10:47 +0000 (09:10 -0700)]
Merge "Add min_ce/max_ce parameters to requestLeConnectionUpdate()" am:
0980006a2a
am:
cb3222d662
Change-Id: I3ce8fd7d371050546e4b5434af351469d5c12309
Joel Galenson [Thu, 12 Apr 2018 16:10:31 +0000 (09:10 -0700)]
Merge "Ensure we do not set seInfoTargetSdkVersion to 0." into pi-dev
am:
52ae06af4d
Change-Id: Ifa75e67c23797b2578cc1e5dfea989a1df953667
TreeHugger Robot [Thu, 12 Apr 2018 16:06:36 +0000 (16:06 +0000)]
Merge "Revert "Clear out tuner prefs since it is disabled"" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 16:02:07 +0000 (16:02 +0000)]
Merge "Check in the new work profile icon" into pi-dev
Rohan Shah [Thu, 12 Apr 2018 16:01:00 +0000 (09:01 -0700)]
Merge "[Notif] Use OK instead of DONE for blocking helper" into pi-dev
am:
3dee3d19c2
Change-Id: I53f553e134a63779916b72f923f19c92f603ecfe
TreeHugger Robot [Thu, 12 Apr 2018 15:53:03 +0000 (15:53 +0000)]
Merge "Ensure we do not set seInfoTargetSdkVersion to 0." into pi-dev
Stanley Tng [Thu, 12 Apr 2018 15:50:35 +0000 (08:50 -0700)]
Merge "Add min_ce/max_ce parameters to requestLeConnectionUpdate()"
am:
0980006a2a
Change-Id: I3aec5bce2861518d79ae80dd32562d83bc0c7ef4
TreeHugger Robot [Thu, 12 Apr 2018 15:47:30 +0000 (15:47 +0000)]
Merge "[Notif] Use OK instead of DONE for blocking helper" into pi-dev
Julia Reynolds [Thu, 12 Apr 2018 14:48:46 +0000 (10:48 -0400)]
Pre P apps can't change new fields
Screen off means fullscreen intents, lights, and ambient
in P but pre-P mean only lights and full screen intents.
Test: runtest systemui-notification, cts
Change-Id: I83857b5df2f669751df34d58aa645f4102b8e0e4
Fixes:
77470790
Amin Shaikh [Thu, 12 Apr 2018 15:08:40 +0000 (08:08 -0700)]
Merge changes I6358cfe3,I00b20bd7 into pi-dev
am:
ef85bbfe4d
Change-Id: I19b0bc43a480d1759f8412406f3755ab2592fd29
Rohan Shah [Thu, 12 Apr 2018 14:58:28 +0000 (07:58 -0700)]
Merge "[Notif] Allow locking importance on notification" into pi-dev
am:
8e7f23a74c
Change-Id: I7ddba513e0173fbaba844ea7dea61861a5f77951
Jason Monk [Thu, 12 Apr 2018 14:58:06 +0000 (14:58 +0000)]
Revert "Clear out tuner prefs since it is disabled"
Bug:
74851117
Fixes:
77937472
This reverts commit
8bb9bbf152e35cdb4263aa1132827d51eb57e8b4.
Change-Id: I2dea3fec7ca3f59c63ce9395ba2784ca9dc58316
TreeHugger Robot [Thu, 12 Apr 2018 14:55:55 +0000 (14:55 +0000)]
Merge changes I6358cfe3,I00b20bd7 into pi-dev
* changes:
Fix status icon tint in QQS.
Fix QQS side padding for icons and tiles.
Rohan Shah [Thu, 12 Apr 2018 14:49:11 +0000 (14:49 +0000)]
Merge "[Notif] Allow locking importance on notification" into pi-dev
Adrian Roos [Thu, 12 Apr 2018 14:42:59 +0000 (07:42 -0700)]
Merge "ScreenDecorations: Only draw cutout if requested" into pi-dev
am:
819fffaf1d
Change-Id: I83f228f42789b40816c39b517c53e35ae74f2554
Stanley Tng [Thu, 12 Apr 2018 14:36:12 +0000 (14:36 +0000)]
Merge "Add min_ce/max_ce parameters to requestLeConnectionUpdate()"
TreeHugger Robot [Thu, 12 Apr 2018 14:35:33 +0000 (14:35 +0000)]
Merge "ScreenDecorations: Only draw cutout if requested" into pi-dev
Tony Mak [Thu, 12 Apr 2018 14:30:24 +0000 (15:30 +0100)]
Check in the new work profile icon
Test: Settings -> Google -> Observe the icon
Fixes:
77952474
Change-Id: I7b26651bbc06aa496ae98f3030a3a1458ffdba1f
richard chou [Thu, 12 Apr 2018 13:42:08 +0000 (06:42 -0700)]
Merge "Reset SIM state if the subscription/slot is no longer active." into pi-dev
am:
f6840a17ff
Change-Id: If3a7bd8e0d9c72718761c3508dd898abef00e3c8
TreeHugger Robot [Thu, 12 Apr 2018 13:32:35 +0000 (13:32 +0000)]
Merge "Reset SIM state if the subscription/slot is no longer active." into pi-dev
Wale Ogunwale [Thu, 12 Apr 2018 12:33:09 +0000 (05:33 -0700)]
Merge "Clean up APIs before declaring API 28." into pi-dev
am:
fb10508cfa
Change-Id: Ic20ef429dbae1c9c5702094e1203838517b3ec38
Wale Ogunwale [Thu, 12 Apr 2018 12:19:56 +0000 (12:19 +0000)]
Merge "Clean up APIs before declaring API 28." into pi-dev
Jorim Jaggi [Thu, 12 Apr 2018 11:27:09 +0000 (04:27 -0700)]
Merge "Fix issue with leaked preserved surface" into pi-dev
am:
682ca4122d
Change-Id: Icd502a24ae7502e4504e5341c9fd8f6da90cee67
Jorim Jaggi [Thu, 12 Apr 2018 11:14:55 +0000 (11:14 +0000)]
Merge "Fix issue with leaked preserved surface" into pi-dev
Henry Liu [Thu, 12 Apr 2018 10:53:54 +0000 (03:53 -0700)]
Merge "Fix [kv-4] PerformBackupTask possible NPE/Wrong package report." into pi-dev
am:
b30a1b0668
Change-Id: If6b49d2087a1b007a0befa6b9820cf9d5957eb29
TreeHugger Robot [Thu, 12 Apr 2018 10:38:23 +0000 (10:38 +0000)]
Merge "Fix [kv-4] PerformBackupTask possible NPE/Wrong package report." into pi-dev
Chong Zhang [Thu, 12 Apr 2018 10:13:29 +0000 (03:13 -0700)]
Merge "Fix missing video caps for HEIC type encoders" into pi-dev
am:
773791a94c
Change-Id: If67f87d568b36da0622c387e9a3e195014e8a032
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:59:28 +0000 (09:59 +0000)]
Merge "Fix missing video caps for HEIC type encoders" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 09:55:45 +0000 (09:55 +0000)]
Merge "Cleaning up frameworks protos." into pi-dev
Adrian Roos [Thu, 12 Apr 2018 08:13:48 +0000 (10:13 +0200)]
ScreenDecorations: Only draw cutout if requested
Change-Id: I149e9f7d8b1ec7164e717f713731c618cf2772c0
Fixes:
77798197
Test: set config_fillMainBuiltInDisplayCutout=false, verify no soft cutout gets drawn.
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
richard chou [Thu, 12 Apr 2018 06:25:16 +0000 (14:25 +0800)]
Reset SIM state if the subscription/slot is no longer active.
Reset the cached SIM state if the subscription and associated slot is not active.
Bug:
77702165
Bug:
75499020
Test: Nova team An-Cheng verified it manually.
Change-Id: Ic5adfbe637d29bd7e12e277e9d89d4ad56350adf
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"
Rohan Shah [Thu, 12 Apr 2018 04:14:50 +0000 (00:14 -0400)]
[Notif] Use OK instead of DONE for blocking helper
Updated string to fit blocking helper/inline control spec.
Test: Visually, string change tested with flags
Change-Id: I9730f53ccad5c21b9f840bf5907438ea4828bd9d
Fixes:
77320853
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
Henry Liu [Wed, 11 Apr 2018 06:18:59 +0000 (14:18 +0800)]
Fix [kv-4] PerformBackupTask possible NPE/Wrong package report.
mCurrentPackage is null when package doesn't exist, which lead test
failed with NPE
Use request.packageName for case BackupTransport.AGENT_UNKNOWN instead
Bug:
77272500
Test: m -j RunFrameworksServicesRoboTests ROBOTEST_FILTER=PerformBackupTaskTest
Change-Id: I27be85f0c3f95e36edd92d0d552189fbcf6952dd
(cherry picked from commit
87f1209ac6398c1045845640e620fc9d3b36f9f5)
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
Rohan Shah [Wed, 11 Apr 2018 03:48:47 +0000 (23:48 -0400)]
[Notif] Allow locking importance on notification
Currently locking only works on channel - this CL allows doing
so on the overarching notification too. Added locking field in
appropriate places in record and surfaced it to other bits via
the RankingHelper.
Test: Visually, reproduced organically (+ deleting /data/ files)
Fixes:
77775657
Change-Id: Ie46093921dd6c1ae3533ded7b87faaa475a631e4
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