OSDN Git Service
Hall Liu [Thu, 12 Apr 2018 22:18:07 +0000 (15:18 -0700)]
[automerger skipped] Merge "Make setServiceId a TestApi" am:
bd6bf7cbe8
am:
d07eb64e09 -s ours
Change-Id: I47993c2fe5d68e7fa4aec5f2f15c987e99baf543
Hall Liu [Thu, 12 Apr 2018 22:02:50 +0000 (15:02 -0700)]
Merge "Make setServiceId a TestApi"
am:
bd6bf7cbe8
Change-Id: I5d95289427ea76d1011c6ba4365e55b312a89be5
Remi NGUYEN VAN [Thu, 12 Apr 2018 21:30:05 +0000 (14:30 -0700)]
Merge "Add rate limiting and logging for NetworkStats." into pi-dev
am:
c9185b5f3c
Change-Id: I446a85f8d74fb33abb3a5f6fb1ef86f3c24bb6d4
Kevin Chyn [Thu, 12 Apr 2018 21:25:05 +0000 (14:25 -0700)]
Merge "Change fingerprint dialog radius to 4dp" into pi-dev
am:
b334c84a97
Change-Id: If0a0852f7a409ad661e70ce7a9302d1f80932758
Chris Tate [Thu, 12 Apr 2018 21:20:04 +0000 (14:20 -0700)]
Merge "Correct bg service start policy re bg-restricted state" into pi-dev
am:
ec41f74561
Change-Id: Idb9d87e144121e2d08f08d596f4a366dd5380da0
Tracy Zhou [Thu, 12 Apr 2018 21:14:46 +0000 (14:14 -0700)]
Merge "Move QuickStep onboarding strings from Launcher to SysUI" into pi-dev
am:
ea2e735d5b
Change-Id: I7912d867d1a42aef147716e1ca6d26f9478c7644
Julia Reynolds [Thu, 12 Apr 2018 21:10:08 +0000 (14:10 -0700)]
Merge "Catch exceptions reading calendar events" into pi-dev
am:
c5fb960b01
Change-Id: Iea9f7ea6add748b8ac89994f56ed80e6dd5c8826
Evan Laird [Thu, 12 Apr 2018 21:05:44 +0000 (14:05 -0700)]
Merge "Limit status icons and show etc dots" into pi-dev
am:
909086509c
Change-Id: I1d49128196ebf708ce2a452660d08f385afef932
Amin Shaikh [Thu, 12 Apr 2018 20:58:50 +0000 (13:58 -0700)]
Merge "Show warning when enabling airplane mode in ECM." into pi-dev
am:
74881c2021
Change-Id: I51c7ef7fb4948500ae1ec5a93dc1b3a6f0c93e49
Dmitry Dementyev [Thu, 12 Apr 2018 20:49:30 +0000 (13:49 -0700)]
Merge "Don't store deprecated trustedHardwarePublicKey field." into pi-dev
am:
6ce8408618
Change-Id: I2a71b4203ab3fa6c51baa9745669b0434f706345
Hall Liu [Thu, 12 Apr 2018 20:41:44 +0000 (20:41 +0000)]
Merge "Make setServiceId a TestApi"
Colin Cross [Thu, 12 Apr 2018 20:30:13 +0000 (13:30 -0700)]
Merge "Greylist APIs used by Android Auto projection" into pi-dev
am:
fa6182b1e6
Change-Id: I8559033c33c5512b98827b2304f7560ae0f39ad9
TreeHugger Robot [Thu, 12 Apr 2018 19:54:12 +0000 (19:54 +0000)]
Merge "Add rate limiting and logging for NetworkStats." into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 19:52:39 +0000 (19:52 +0000)]
Merge "Change fingerprint dialog radius to 4dp" into pi-dev
Chris Tate [Thu, 12 Apr 2018 19:41:31 +0000 (19:41 +0000)]
Merge "Correct bg service start policy re bg-restricted state" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 19:39:39 +0000 (19:39 +0000)]
Merge "Move QuickStep onboarding strings from Launcher to SysUI" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 19:33:50 +0000 (19:33 +0000)]
Merge "Catch exceptions reading calendar events" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 19:33:29 +0000 (19:33 +0000)]
Merge "Limit status icons and show etc dots" into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 19:23:43 +0000 (19:23 +0000)]
Merge "Show warning when enabling airplane mode in ECM." into pi-dev
Dmitry Dementyev [Thu, 12 Apr 2018 19:14:26 +0000 (19:14 +0000)]
Merge "Don't store deprecated trustedHardwarePublicKey field." into pi-dev
TreeHugger Robot [Thu, 12 Apr 2018 19:09:39 +0000 (19:09 +0000)]
Merge "Greylist APIs used by Android Auto projection" into pi-dev
Bill Yi [Thu, 12 Apr 2018 19:01:55 +0000 (12:01 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
a87e56c97a -s ours
Change-Id: I8d85ddb74f1b9bbd858bd3c82e1d1078662ffd8c
Remi NGUYEN VAN [Thu, 12 Apr 2018 10:26:34 +0000 (19:26 +0900)]
Add rate limiting and logging for NetworkStats.
Bug:
77908520,
77808546,
77853238,
77154412
Test: atest com.android.server.net.NetworkStatsServiceTest
Test: manual: flashed, verified network usage updated
Change-Id: I905dbea85e00f80103916939f6d4bf8cab931d03
TreeHugger Robot [Thu, 12 Apr 2018 18:30:45 +0000 (18:30 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Thu, 12 Apr 2018 18:28:02 +0000 (11:28 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
26ae29f1be -s ours
Change-Id: If1322bf309cf705c0998e59ad3e011aae4d29844
Tracy Zhou [Thu, 12 Apr 2018 03:40:53 +0000 (20:40 -0700)]
Move QuickStep onboarding strings from Launcher to SysUI
Test: N/A
Bug:
70180942
Change-Id: Ic3bd63899017f23c011a41a7a5a9e73a87b9eec1
Julia Reynolds [Thu, 12 Apr 2018 18:16:09 +0000 (14:16 -0400)]
Catch exceptions reading calendar events
Test: none
Change-Id: I3be8d3abc5feead1d940ab86d8edcd770187eca9
Fixes:
70568179
TreeHugger Robot [Thu, 12 Apr 2018 18:20:34 +0000 (18:20 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Kevin Chyn [Thu, 12 Apr 2018 18:07:57 +0000 (11:07 -0700)]
Change fingerprint dialog radius to 4dp
Fixes:
77864901
Test: manual test with AOSP build
Change-Id: Ib61052a45c8de1b684527c54d73cfb45ffe672b5
Evan Laird [Thu, 12 Apr 2018 13:54:11 +0000 (09:54 -0400)]
Limit status icons and show etc dots
When <= 5 status icons exist, try to show them all (space permitting).
If > 5 exist, show 4 and etc dots.
Test: visual
Change-Id: I4c09344bee75b3cab6256dd69f11337b9b667b0f
Fixes:
73778753
Fixes:
77660387
Bug:
77822905
Kweku Adams [Thu, 12 Apr 2018 17:44:48 +0000 (10:44 -0700)]
Merge "Setting stack traces to EXPLICIT." into pi-dev
am:
6d49896324
Change-Id: Ief9ca2e10bb462781cef2bfa6c375407afa669be
Ryan Mitchell [Thu, 12 Apr 2018 17:39:00 +0000 (10:39 -0700)]
Merge "AAPT: Multiple period legacy support and errors" into pi-dev
am:
f845891031
Change-Id: Id1ac75606df1b8bf99281febf5c7266de6889457
Amin Shaikh [Thu, 12 Apr 2018 17:29:32 +0000 (13:29 -0400)]
Show warning when enabling airplane mode in ECM.
Change-Id: I85401e661243f189589d4914479da9e60242d192
Fixes:
73084792
Test: manual
Kweku Adams [Thu, 12 Apr 2018 17:23:17 +0000 (17:23 +0000)]
Merge "Setting stack traces to EXPLICIT." into pi-dev
Ryan Mitchell [Thu, 12 Apr 2018 17:21:32 +0000 (17:21 +0000)]
Merge "AAPT: Multiple period legacy support and errors" into pi-dev
jiabin [Thu, 12 Apr 2018 17:17:24 +0000 (10:17 -0700)]
Merge "Change log level when microphone enumeration APIs native call fail." into pi-dev
am:
ccaba49ab5
Change-Id: I06bae53d958898a61bea519cc5ee3a1dae4a7074
Colin Cross [Thu, 12 Apr 2018 17:12:18 +0000 (10:12 -0700)]
Greylist APIs used by Android Auto projection
Fixes:
04-06 19:12:06.529 W android.gms:ca: Accessing hidden method Landroid/media/AudioAttributes$Builder;->addTag(Ljava/lang/String;)Landroid/media/AudioAttributes$Builder; (blacklist, reflection)
Bug:
77315795
Test: make
Change-Id: I171fbfb60623a970285ac89499bbb94b1e5e57d4
TreeHugger Robot [Thu, 12 Apr 2018 17:05:12 +0000 (17:05 +0000)]
Merge "Change log level when microphone enumeration APIs native call fail." into pi-dev
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
Bill Yi [Thu, 12 Apr 2018 08:36:42 +0000 (01:36 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I8e1291d3c20839792b7951f394ba91894a1e7b4c
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
Bill Yi [Thu, 12 Apr 2018 07:43:28 +0000 (00:43 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I4c3f651abc3c420a25b97c099e0bda5cede39421
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
OSDN Git Service
