OSDN Git Service
Rubin Xu [Fri, 22 Mar 2019 13:31:28 +0000 (13:31 +0000)]
Fix SecurityException when calling DevicePolicyManager.setMaximumTimeToLock
Test: atest com.android.cts.devicepolicy.DeviceOwnerTest#testSecurityLoggingWithSingleUser (only on cuttlefish)
Change-Id: Icd8a24481c281842e9690c6e16c9c31d2d613a2c
Fix:
127264133
Andrei-Valentin Onea [Fri, 22 Mar 2019 11:55:01 +0000 (04:55 -0700)]
[automerger skipped] Merge "Add telephony sources to hiddenapi-mappings" am:
824c531396 am:
f3cf84c690
am:
f8a2dbface -s ours
am skip reason: change_id I1f7d2722bd7621c9f6d1195ea212a7a0454d560d with SHA1
6dd843a6b2 is in history
Change-Id: Ia9bbf24ebd22c4b2b8cae18d5723be98e6c7ceb9
TreeHugger Robot [Fri, 22 Mar 2019 11:51:48 +0000 (11:51 +0000)]
Merge "Add Looper.prepare() to doInBackground()"
Lorenzo Colitti [Fri, 22 Mar 2019 11:46:21 +0000 (11:46 +0000)]
Merge "Fix API in CaptivePortal and ConnectivityManager"
Andrei-Valentin Onea [Fri, 22 Mar 2019 11:46:02 +0000 (04:46 -0700)]
Merge "Add telephony sources to hiddenapi-mappings" am:
824c531396
am:
f3cf84c690
Change-Id: I469462b12f0813e6ed7bd179ff58d4c09fbd50a5
Abhijeet Kaur [Thu, 21 Mar 2019 15:42:43 +0000 (15:42 +0000)]
Add Looper.prepare() to doInBackground()
Fix runtime error that was being thrown as Looper.prepare() was not called
in the async function doInBackground.
Bug:
124612105
Test: Was not able to reproduce the bug (that is make code execution flow
through the catch block).
* Reproduced by throwing IOException in the try block so that code flows
to the catch block.
* Build and flash.
* Take interactive bugreport and change title and name of the bugreport from
the progress bar.
Change-Id: I6a5ea594d95462e1c66bd28eb81dd5f4daa6f35e
Andrei-Valentin Onea [Fri, 22 Mar 2019 11:36:49 +0000 (04:36 -0700)]
Merge "Add telephony sources to hiddenapi-mappings"
am:
824c531396
Change-Id: Ic5a0a2600dcdd030139f0c50e3b445053ba2c2c5
Andrei-Valentin Onea [Fri, 22 Mar 2019 11:24:50 +0000 (11:24 +0000)]
Merge "Add telephony sources to hiddenapi-mappings"
Jack Yu [Fri, 22 Mar 2019 11:18:26 +0000 (04:18 -0700)]
[automerger skipped] Merge "Renamed the variable" am:
afa94f4664 am:
f2a8ea192c
am:
da5ed35119 -s ours
am skip reason: change_id I4deb1271818019465c55b59cd4a4a8029b514697 with SHA1
1746d2582a is in history
Change-Id: I9906f4cd11e47e45e6b3043b8c7510173f3e7a6d
Rubin Xu [Fri, 22 Mar 2019 11:12:21 +0000 (11:12 +0000)]
Merge "Improve javadoc"
Remi NGUYEN VAN [Fri, 22 Mar 2019 11:12:02 +0000 (04:12 -0700)]
Merge "Fix targetSdkVersion for NetworkStack" am:
42b97de9d3 am:
ba2f3d2fdf
am:
1e7e29593b
Change-Id: Ic2d8c541ab6ba827d13f7d6a00a6f3b279489646
Hall Liu [Fri, 22 Mar 2019 11:01:46 +0000 (04:01 -0700)]
[automerger skipped] Merge "Add NETWORK_SCAN permission" am:
419956210a am:
3f7de4bc99
am:
92600e3fda -s ours
am skip reason: change_id I2dd4beffca3afdcc0a0f071404ff62747faa3877 with SHA1
e4f2c0f957 is in history
Change-Id: I512c278506ddc440cef01fbe145c8413687126ae
Lucas Lin [Fri, 22 Mar 2019 10:50:47 +0000 (03:50 -0700)]
Merge "Enable PARTIAL_CONNECTIVITY dialog" am:
507d69d5d9 am:
e2f6ad6b48
am:
dd59bce71f
Change-Id: I2ba8244fe582c4194f9d2a60d9562b12d5c8e431
Android Build Merger (Role) [Fri, 22 Mar 2019 10:36:51 +0000 (10:36 +0000)]
Merge "Merge "Support query cancellation for async DNS API" am:
aed6ea52de am:
c19f41b2b2 am:
50c86d592a"
Luke Huang [Fri, 22 Mar 2019 10:35:57 +0000 (03:35 -0700)]
Merge "Support query cancellation for async DNS API" am:
aed6ea52de am:
c19f41b2b2
am:
50c86d592a
Change-Id: I034361541f64c10d72474beaefdb3547c9c2733e
Narayan Kamath [Fri, 22 Mar 2019 10:29:59 +0000 (10:29 +0000)]
Merge "SystemUI: Update styling of media projection permission dialog."
Lucas Lin [Fri, 22 Mar 2019 10:27:52 +0000 (03:27 -0700)]
[automerger skipped] Merge "Modify SettingsLib for partial connectivity" am:
64bb980f45 am:
1eb23ba267
am:
04bd7a8bad -s ours
am skip reason: change_id I4791abe9351c62d9549ada383aa4cc8aa34ddaf2 with SHA1
fc731abf72 is in history
Change-Id: I2829c7d9c54f2e3ce0e067a39d446fb7b73667ca
Android Build Merger (Role) [Fri, 22 Mar 2019 10:10:05 +0000 (10:10 +0000)]
Merge "[automerger skipped] Merge changes from topic "iwlan_api_review" am:
ac3406f9c6 am:
8a6dbb8446 am:
228d75b448 -s ours am skip reason: change_id I0f93c07207b10b566e9f858361e55b18dc0881a0 with SHA1
806b64228d is in history"
Jack Yu [Fri, 22 Mar 2019 10:08:48 +0000 (03:08 -0700)]
[automerger skipped] Merge changes from topic "iwlan_api_review" am:
ac3406f9c6 am:
8a6dbb8446
am:
228d75b448 -s ours
am skip reason: change_id I0f93c07207b10b566e9f858361e55b18dc0881a0 with SHA1
806b64228d is in history
Change-Id: Ia19c98537474060a68a0eae6f26dcb9f0c385124
TreeHugger Robot [Fri, 22 Mar 2019 10:03:29 +0000 (10:03 +0000)]
Merge "Fix activities cannot be resumed when non-secure keyguard shown"
Brad Ebinger [Fri, 22 Mar 2019 10:02:46 +0000 (03:02 -0700)]
Merge "Fix build due to no explanatory comment." am:
0b6c77167e am:
7d73c0b4d6
am:
e6a02a8067
Change-Id: Ib3e217045a6d46dc7185b518449d4a905ac78c8d
TreeHugger Robot [Fri, 22 Mar 2019 09:46:14 +0000 (09:46 +0000)]
Merge "resolve merge conflicts of
0569184dc0336873ecae5d7ae6210393f9e27282 to master"
Hai Zhang [Fri, 22 Mar 2019 09:43:48 +0000 (09:43 +0000)]
Merge "Add getDeclaredShareLibraries() for role qualification checking."
Chiachang Wang [Fri, 22 Mar 2019 09:43:40 +0000 (09:43 +0000)]
Merge "Add network stack proto"
TreeHugger Robot [Fri, 22 Mar 2019 09:42:22 +0000 (09:42 +0000)]
Merge "Bubble permission prompt - set theme font"
Jack Yu [Fri, 22 Mar 2019 09:41:17 +0000 (02:41 -0700)]
Merge "Renamed the variable" am:
afa94f4664
am:
f2a8ea192c
Change-Id: I915e00c7392e31180099abf35982cc1a5a3ffc17
Jack Yu [Fri, 22 Mar 2019 09:32:18 +0000 (02:32 -0700)]
Merge "Renamed the variable"
am:
afa94f4664
Change-Id: I688d8126bb0207f8efcccba3e9857144e3f6067b
TreeHugger Robot [Fri, 22 Mar 2019 09:20:17 +0000 (09:20 +0000)]
Merge "Offloaded playback: use AudioAttributes in support check"
Treehugger Robot [Fri, 22 Mar 2019 09:14:14 +0000 (09:14 +0000)]
Merge "Renamed the variable"
Shawn Lin [Fri, 22 Mar 2019 08:58:57 +0000 (08:58 +0000)]
Merge "Fixed battery icon truncated on AOD mode"
Remi NGUYEN VAN [Fri, 22 Mar 2019 08:16:52 +0000 (17:16 +0900)]
Fix API in CaptivePortal and ConnectivityManager
- Remove CaptivePortal constructor from SystemApi. This constructor was
added in Q timeframe and ends up being unnecessary since
CaptivePortal creation was refactored to ConnectivityService because
of visibility issues on ICaptivePortal.
- Rename getAvoidBadWifi to shouldAvoidBadWifi
- Add permission annotation for shouldAvoidBadWifi
Test: flashed, WiFi and captive portal works
Bug:
128935314
Bug:
128935673
(clean cherry-pick of AOSP I7395d4a4db6a64398a827692aee1956c011873e5)
Change-Id: I09545c00af3519dbf141dd5951b28f49e37b3e80
TreeHugger Robot [Fri, 22 Mar 2019 08:14:13 +0000 (08:14 +0000)]
Merge "Allow app-level updates to video/audio timers"
Robert Shih [Fri, 22 Mar 2019 07:44:20 +0000 (07:44 +0000)]
Merge "MediaPlayer2 DRM: API improvements"
Remi NGUYEN VAN [Fri, 22 Mar 2019 07:21:21 +0000 (00:21 -0700)]
Merge "Fix targetSdkVersion for NetworkStack" am:
42b97de9d3
am:
ba2f3d2fdf
Change-Id: I7be8a9f1020d56cdf9ac87a47a25cab77d66958e
Remi NGUYEN VAN [Fri, 22 Mar 2019 07:12:43 +0000 (00:12 -0700)]
Merge "Fix targetSdkVersion for NetworkStack"
am:
42b97de9d3
Change-Id: Id9786b9d607950990427316379c3bb46bf188703
Remi NGUYEN VAN [Fri, 22 Mar 2019 07:00:50 +0000 (07:00 +0000)]
Merge "Fix targetSdkVersion for NetworkStack"
Xiangyu/Malcolm Chen [Fri, 22 Mar 2019 06:48:24 +0000 (06:48 +0000)]
Merge changes from topics "
128902411", "
128645056"
* changes:
API Feedback for CBRS
Remove clearDefaultsForInactiveSubIds.
TreeHugger Robot [Fri, 22 Mar 2019 06:37:36 +0000 (06:37 +0000)]
Merge "Add intent action constant to zen access setting page"
Hall Liu [Fri, 22 Mar 2019 06:17:16 +0000 (23:17 -0700)]
Merge "Add NETWORK_SCAN permission" am:
419956210a
am:
3f7de4bc99
Change-Id: Ic69dd3d51ac2038ff5291ec6ce3bd176c66b9d31
Hall Liu [Fri, 22 Mar 2019 06:02:09 +0000 (23:02 -0700)]
Merge "Add NETWORK_SCAN permission"
am:
419956210a
Change-Id: Ia9fe0ff68145e1a6bbb5bd903012e1ecb57a3d0b
Hall Liu [Fri, 22 Mar 2019 05:44:10 +0000 (05:44 +0000)]
Merge "Add NETWORK_SCAN permission"
Hall Liu [Thu, 21 Mar 2019 23:08:03 +0000 (16:08 -0700)]
Add NETWORK_SCAN permission
Bug:
126779616
Test: compiles
Change-Id: I2dd4beffca3afdcc0a0f071404ff62747faa3877
Merged-In: I2dd4beffca3afdcc0a0f071404ff62747faa3877
TreeHugger Robot [Fri, 22 Mar 2019 05:43:36 +0000 (05:43 +0000)]
Merge "Reland "Make Paint default to filtering Bitmaps""
Hall Liu [Fri, 22 Mar 2019 05:43:07 +0000 (05:43 +0000)]
Merge "Add NETWORK_SCAN permission"
Kevin Chyn [Fri, 22 Mar 2019 05:41:21 +0000 (05:41 +0000)]
Merge "Fixed talkback issue with biometric dialog."
Hyundo Moon [Fri, 22 Mar 2019 05:30:13 +0000 (05:30 +0000)]
Merge "Remove MediaSessionEngine"
TreeHugger Robot [Fri, 22 Mar 2019 04:56:16 +0000 (04:56 +0000)]
Merge "AccessibilityRequestPreparer shouldn't crash if the view is released before the preparer is added or removed."
Malcolm Chen [Thu, 21 Mar 2019 03:32:27 +0000 (20:32 -0700)]
API Feedback for CBRS
Bug:
128902411
Test: unittest
Change-Id: I2476834a5048d0e3c2c3413d7168a7a3ad2d7042
Lucas Lin [Fri, 22 Mar 2019 04:40:39 +0000 (21:40 -0700)]
Merge "Enable PARTIAL_CONNECTIVITY dialog" am:
507d69d5d9
am:
e2f6ad6b48
Change-Id: I2e1947cdf6e084aefd4d2ccd7b345df79c62e383
Lucas Lin [Fri, 22 Mar 2019 04:30:48 +0000 (21:30 -0700)]
Merge "Enable PARTIAL_CONNECTIVITY dialog"
am:
507d69d5d9
Change-Id: I88ca44ef0c0a7cf48538421022d0fed10d15fc26
Jean-Michel Trivi [Thu, 21 Mar 2019 23:08:50 +0000 (16:08 -0700)]
Offloaded playback: use AudioAttributes in support check
AudioAttributes can influence offload support, add them in
method to check for support
Bug:
86837964
Test: cts-tradefed run cts -m CtsMediaTestCases -t android.media.cts.AudioTrackOffloadTest#testAudioTrackOffload
Change-Id: If4037d0611ec1264d23d1779b9ac6efd9fd1244c
TreeHugger Robot [Fri, 22 Mar 2019 04:19:44 +0000 (04:19 +0000)]
Merge "Use VkAndroidHardwareBufferUsageANDROID to compute HWUI usage flags"
Stan Iliev [Fri, 22 Mar 2019 04:19:29 +0000 (04:19 +0000)]
Merge changes from topic "vkDequeueReleaseFence"
* changes:
Block GPU on dequeue fence only if it has not signalled already
Block GPU on release fence from dequeueBuffer earlier
Lucas Lin [Fri, 22 Mar 2019 04:17:43 +0000 (04:17 +0000)]
Merge "Enable PARTIAL_CONNECTIVITY dialog"
Luke Huang [Fri, 22 Mar 2019 04:13:29 +0000 (21:13 -0700)]
Merge "Support query cancellation for async DNS API" am:
aed6ea52de
am:
c19f41b2b2
Change-Id: I890bbb94bf1b8e2242efeb5c868e289a8ae4a95d
TreeHugger Robot [Fri, 22 Mar 2019 04:09:18 +0000 (04:09 +0000)]
Merge "Add logging for bouncer dismissal reasons."
TreeHugger Robot [Fri, 22 Mar 2019 03:57:26 +0000 (03:57 +0000)]
Merge "Raster and badge directshare with IconFactory"
TreeHugger Robot [Fri, 22 Mar 2019 03:51:16 +0000 (03:51 +0000)]
Merge "Remove unnecessary called from system process warning."
Luke Huang [Fri, 22 Mar 2019 03:50:18 +0000 (20:50 -0700)]
Merge "Support query cancellation for async DNS API"
am:
aed6ea52de
Change-Id: I400d98e13cf36ca16c3743eddee96bfae4b47b5c
Robert Shih [Wed, 20 Mar 2019 06:06:39 +0000 (23:06 -0700)]
MediaPlayer2 DRM: API improvements
* Document how to build valid DrmPreparationInfo
* Add getters for DrmPreparationInfo
* Make DrmEventCallback an abstract class
* Document set/clearDrmEventCallback are synchronous
Bug:
128548364
Test: build
Change-Id: Iecc2a8bcd410ea729ac9fd4c2b3f1428fc4b5e7d
Luke Huang [Fri, 22 Mar 2019 03:26:21 +0000 (03:26 +0000)]
Merge "Support query cancellation for async DNS API"
Michael Wachenschwanz [Fri, 22 Mar 2019 03:20:37 +0000 (03:20 +0000)]
Merge "Add EXTRA_DROPPED_COUNT for ACTION_DROPBOX_ENTRY_ADDED"
Alex Salo [Fri, 22 Mar 2019 03:18:12 +0000 (03:18 +0000)]
Merge "Add disableSelf() and more failure codes"
TreeHugger Robot [Fri, 22 Mar 2019 03:04:24 +0000 (03:04 +0000)]
Merge "Game Driver Metrics: update meta data naming for driver build time"
Lorenzo Colitti [Fri, 22 Mar 2019 03:02:50 +0000 (12:02 +0900)]
resolve merge conflicts of
0569184dc0336873ecae5d7ae6210393f9e27282 to master
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I3af8ee8a7d8a4ff9dca0195b1947679cc09b2e89
TreeHugger Robot [Fri, 22 Mar 2019 03:02:04 +0000 (03:02 +0000)]
Merge "Make LSS report honest password quality to DPMS"
Brad Stenning [Fri, 22 Mar 2019 02:18:58 +0000 (02:18 +0000)]
Merge "Provide a hook for forcing all system bars to be displayed at all times"
TreeHugger Robot [Fri, 22 Mar 2019 01:57:35 +0000 (01:57 +0000)]
Merge "Resolve feedback from API review: MediaDrm"
Lucas Lin [Fri, 22 Mar 2019 01:42:46 +0000 (18:42 -0700)]
Merge "Modify SettingsLib for partial connectivity" am:
64bb980f45
am:
1eb23ba267
Change-Id: I8b6c1ef312c0b79f41ebbfe17eaccfa535ac0597
Hai Zhang [Wed, 20 Mar 2019 23:11:07 +0000 (16:11 -0700)]
Add getDeclaredShareLibraries() for role qualification checking.
Bug:
124452117
Test: build
Change-Id: I13e4313c4ab5305335fc9490dfc58b03a24a86dd
TreeHugger Robot [Fri, 22 Mar 2019 01:35:43 +0000 (01:35 +0000)]
Merge "Allow to listen for addition of work profiles."
TreeHugger Robot [Fri, 22 Mar 2019 01:34:34 +0000 (01:34 +0000)]
Merge "AudioPolicy: add test flagging for focus policy tests"
Lucas Lin [Fri, 22 Mar 2019 01:30:59 +0000 (18:30 -0700)]
Merge "Modify SettingsLib for partial connectivity"
am:
64bb980f45
Change-Id: I8a66d66ca058613a3a173593c64c789c55269c88
TreeHugger Robot [Fri, 22 Mar 2019 01:26:15 +0000 (01:26 +0000)]
Merge "Trigger Augmented Autofill when the standard service is not set."
Lucas Lin [Fri, 22 Mar 2019 01:16:42 +0000 (01:16 +0000)]
Merge "Modify SettingsLib for partial connectivity"
TreeHugger Robot [Fri, 22 Mar 2019 01:15:50 +0000 (01:15 +0000)]
Merge "Remove Intent.ACTION_REVIEW_APP_PERMISSION_USAGE."
TreeHugger Robot [Fri, 22 Mar 2019 01:15:20 +0000 (01:15 +0000)]
Merge "Revert "Checkbox for removing contributes files""
TreeHugger Robot [Fri, 22 Mar 2019 01:14:10 +0000 (01:14 +0000)]
Merge "Remove the navigation swipe down for expanding notifications gesture"
lucaslin [Thu, 21 Mar 2019 04:40:47 +0000 (12:40 +0800)]
Modify SettingsLib for partial connectivity
Add partial connectivity related settings in SettingsLib.
Bug:
113450764
Bug:
128489091
Test: 1. Build pass.
2. Fake partial connectivity case for testing.
Change-Id: I0733ecc9070e6c4281fdff40f432605d139355ec
Merged-In: I4791abe9351c62d9549ada383aa4cc8aa34ddaf2
lucaslin [Thu, 21 Mar 2019 03:59:22 +0000 (11:59 +0800)]
Enable PARTIAL_CONNECTIVITY dialog
Enable PARTIAL_CONNECTIVITY dialog to complete the function.
Bug:
113450764
Test: 1. Build pass
2. atest FrameworksNetTests
3. atest NetworkStackTests
4. Change captive_portal_https_url to https://invalid.com
to simulate partial connectivity.
Change-Id: I5c9fe7a898d30d2f7f75142c85e73fefc257a147
TreeHugger Robot [Fri, 22 Mar 2019 01:09:29 +0000 (01:09 +0000)]
Merge "Move public methods of ResolverComparator to abstract class."
Jack Yu [Fri, 22 Mar 2019 01:05:52 +0000 (18:05 -0700)]
Merge changes from topic "iwlan_api_review" am:
ac3406f9c6
am:
8a6dbb8446
Change-Id: Ie30207bae71e1c45a9d2ae76132c3012f9f5dd37
Brad Ebinger [Fri, 22 Mar 2019 00:55:02 +0000 (17:55 -0700)]
Merge "Fix build due to no explanatory comment." am:
0b6c77167e
am:
7d73c0b4d6
Change-Id: I544a7b4a5c24186d675377ee64945d32ffe0a628
Jack Yu [Fri, 22 Mar 2019 00:50:56 +0000 (17:50 -0700)]
Merge changes from topic "iwlan_api_review"
am:
ac3406f9c6
Change-Id: I39775146064de0041c963a460f20a65e94fa6e78
TreeHugger Robot [Fri, 22 Mar 2019 00:49:19 +0000 (00:49 +0000)]
Merge "Upgrade ring vibration level after OTA."
Lorenzo Colitti [Fri, 22 Mar 2019 00:47:26 +0000 (17:47 -0700)]
Merge changes I2e8c2ad9,Ic4f4c7d2 am:
0c089bcc82
am:
9b86ed3c65
Change-Id: I068d2eb07d57779dda4d7b9e5bcd94e0ee8dc686
Brad Ebinger [Fri, 22 Mar 2019 00:44:07 +0000 (17:44 -0700)]
Merge "Fix build due to no explanatory comment."
am:
0b6c77167e
Change-Id: Icc0a8be233ab0a5f5f86541b452ae82e6415fd4c
Lorenzo Colitti [Fri, 22 Mar 2019 00:39:56 +0000 (17:39 -0700)]
Merge changes I2e8c2ad9,Ic4f4c7d2
am:
0c089bcc82
Change-Id: I09d0c721fc8d9755b9310bbe252aa45ab9f147f2
Michael Groover [Fri, 22 Mar 2019 00:34:22 +0000 (00:34 +0000)]
Merge "Add Sensors Off QS tile and display status bar icon when active"
Jack Yu [Fri, 22 Mar 2019 00:29:07 +0000 (00:29 +0000)]
Merge changes from topic "iwlan_api_review"
* changes:
IWLAN API review changes
Unhide methods required for Parcelable class
Added annotations to the API
Brad Ebinger [Fri, 22 Mar 2019 00:25:11 +0000 (00:25 +0000)]
Merge "Fix build due to no explanatory comment."
Lorenzo Colitti [Fri, 22 Mar 2019 00:23:22 +0000 (00:23 +0000)]
Merge changes I2e8c2ad9,Ic4f4c7d2
* changes:
Move the networkstack AIDL interfaces to services/net.
Remove the framework dependency on networkstack-aidl-framework.
Patrick Huang [Fri, 22 Mar 2019 00:20:17 +0000 (17:20 -0700)]
[automerger skipped] Merge "Add "from" extra for ACTION_TOGGLE_SUBSCRIPTION_PRIVILEGED" am:
9a1888ce62 am:
e41be2c876
am:
956b77b87a -s ours
am skip reason: change_id I1367fa988dbc71eb30631ebf9903309eba3ef96d with SHA1
0d081f4c17 is in history
Change-Id: Ifd6dde320607cb720e8135fa4eaac1e5453b7118
Holly Jiuyu Sun [Fri, 22 Mar 2019 00:12:33 +0000 (17:12 -0700)]
[automerger skipped] Merge "Fix the assumption in GetEuiccProfileInfoListResult." am:
ee7a7f63a9 am:
653b7f6059
am:
d710627c77 -s ours
am skip reason: change_id Id29c8f00183660d2195c58c96eb4154454623eb6 with SHA1
5265dc5fc3 is in history
Change-Id: I2f762e784217f3ee5b9eadb862429cfce8fe55b0
Patrick Huang [Fri, 22 Mar 2019 00:11:04 +0000 (17:11 -0700)]
Merge "Add "from" extra for ACTION_TOGGLE_SUBSCRIPTION_PRIVILEGED" am:
9a1888ce62
am:
e41be2c876
Change-Id: I6f343eafd8379253d274c98a9097df50976b9522
Hall Liu [Thu, 21 Mar 2019 23:08:03 +0000 (16:08 -0700)]
Add NETWORK_SCAN permission
Bug:
126779616
Test: compiles
Change-Id: I2dd4beffca3afdcc0a0f071404ff62747faa3877
Nathan Harold [Thu, 21 Mar 2019 23:53:34 +0000 (16:53 -0700)]
[automerger skipped] Merge "Expose CellInfoTdscdma" am:
0b88e07ea5 am:
2c3dba9194
am:
23984e2950 -s ours
am skip reason: change_id Ia75ea9af52796729e26b85ca04fd97b6c9b80f8e with SHA1
2175839ead is in history
Change-Id: I023570a0df49d979365f3307698285da2d872f83
Holly Jiuyu Sun [Thu, 21 Mar 2019 23:52:19 +0000 (16:52 -0700)]
Merge "Fix the assumption in GetEuiccProfileInfoListResult." am:
ee7a7f63a9
am:
653b7f6059
Change-Id: I3affc2649067842c6b7a082ac11e28e34da836d9
Patrick Huang [Thu, 21 Mar 2019 23:51:05 +0000 (16:51 -0700)]
Merge "Add "from" extra for ACTION_TOGGLE_SUBSCRIPTION_PRIVILEGED"
am:
9a1888ce62
Change-Id: I342884174fbaaa13b0973038f6cb70258ba436d7
Nathan Harold [Thu, 21 Mar 2019 23:44:22 +0000 (16:44 -0700)]
Merge "Expose CellInfoTdscdma" am:
0b88e07ea5
am:
2c3dba9194
Change-Id: Iafbadf538af679b87ed4be9831b21562ff701fab