Peter Wang
f7eb0fa797
[Telephony Mainline] Refactored PermissionManager
...
to expose grantDefaultPermissionsToEnabledImsServices,grantDefaultPermissionsToEnabledTelephonyDataServices,revokeDefaultPermissionsFromDisabledTelephonyDataServices
Bug: 138745534
Test: Build and ImsServiceControllerTest
Change-Id: I9a7cf7a3a960e23fc943f58a67baed354c0d2a92
2020-01-15 14:25:18 -08:00
TreeHugger Robot
9edf72d041
Merge "Modify the build version to match changeId stuff"
2020-01-15 19:36:32 +00:00
Automerger Merge Worker
f20fa91702
Merge "Expose ServiceState#getDataNetworkType as SystemApi" am: 38fa60b511 am: 370a934081 am: e3faa5f0ab
...
Change-Id: I7cb7081d62ca6be991bcc85ddc357594ab50b2ae
2020-01-15 19:32:42 +00:00
Automerger Merge Worker
a90f21adcb
Merge changes Ie816e0c6,I5b94e92a,I5391ac49,If074bed1 am: e88817bd42 am: cd54c586bb am: 88c4abb4ee
...
Change-Id: I8a895f7b3b56a93288e88448e58ac6866824ef58
2020-01-15 19:30:42 +00:00
Automerger Merge Worker
e0fd2a2c33
[automerger skipped] DO NOT MERGE Fix AppOpsServiceTest am: c03b32c406 am: 47cc84875c am: ca946bed5f -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie1c0196e20fd8d431dadd01fb538d1cc83a2dffe
2020-01-15 19:30:36 +00:00
Automerger Merge Worker
2679b1ed11
[automerger skipped] Merge "Cleanup ITelephony in TelephonyPermissions with new System API. This method is used by Telephony Module for permission checking." am: 725c54065d am: 3a6b29da40 am: cb5b958917 -s ours
...
am skip reason: Change-Id Ie706e05e6a69e570331c1fe08a8df9677e0d9c8a with SHA-1 145294168f
2020-01-15 19:29:46 +00:00
Mike Ma
73287d1ab3
Merge "Incident Report Extension API"
2020-01-15 19:27:55 +00:00
Automerger Merge Worker
e3faa5f0ab
Merge "Expose ServiceState#getDataNetworkType as SystemApi" am: 38fa60b511 am: 370a934081
...
Change-Id: Ieb226d39bf3a8990c134a9e6e67f50e3c2135ed1
2020-01-15 19:22:15 +00:00
Hall Liu
370a934081
Merge "Expose ServiceState#getDataNetworkType as SystemApi"
...
am: 38fa60b511
2020-01-15 11:16:09 -08:00
Automerger Merge Worker
88c4abb4ee
Merge changes Ie816e0c6,I5b94e92a,I5391ac49,If074bed1 am: e88817bd42 am: cd54c586bb
...
Change-Id: I370ef7e44b7bf2cb4e871e64642c900c0a3da66c
2020-01-15 19:15:27 +00:00
Automerger Merge Worker
ca946bed5f
DO NOT MERGE Fix AppOpsServiceTest am: c03b32c406 am: 47cc84875c
...
Change-Id: Iccb7dc7d5857c2fbd03372cc0f97cfd429ece85f
2020-01-15 19:15:23 +00:00
Automerger Merge Worker
cb5b958917
Merge "Cleanup ITelephony in TelephonyPermissions with new System API. This method is used by Telephony Module for permission checking." am: 725c54065d am: 3a6b29da40
...
Change-Id: I10447351e53ff84e6b2c747574080741189c6206
2020-01-15 19:14:45 +00:00
TreeHugger Robot
458fbcba7f
Merge "Add conversation-centric inline controls"
2020-01-15 19:09:53 +00:00
Josh Tsuji
2ffa2788ce
Merge changes I55b0db82,Ic3cea392
...
* changes:
Adds 'flinging-then-springing' to the PhysicsAnimator.
Fix isPropertyAnimating to include flings, and add tests.
2020-01-15 19:09:40 +00:00
Hall Liu
38fa60b511
Merge "Expose ServiceState#getDataNetworkType as SystemApi"
2020-01-15 19:09:19 +00:00
Philip P. Moltmann
cd54c586bb
Merge changes Ie816e0c6,I5b94e92a,I5391ac49,If074bed1
...
am: e88817bd42
2020-01-15 11:08:24 -08:00
Philip P. Moltmann
47cc84875c
DO NOT MERGE Fix AppOpsServiceTest
...
am: c03b32c406
2020-01-15 11:08:21 -08:00
TreeHugger Robot
bcc07fc3b9
Merge "Minor fixes for devices without WallpaperService."
2020-01-15 19:04:57 +00:00
TreeHugger Robot
5988021002
Merge "Multiple shortcut menu for android R (6/n)."
2020-01-15 19:02:52 +00:00
Shuo Qian
3a6b29da40
Merge "Cleanup ITelephony in TelephonyPermissions with new System API. This method is used by Telephony Module for permission checking."
...
am: 725c54065d
2020-01-15 11:02:44 -08:00
Peter Wang
909d3a2149
Merge "[Telephony Mainline] Removed IPackageManager reference"
2020-01-15 19:01:47 +00:00
Treehugger Robot
e88817bd42
Merge changes Ie816e0c6,I5b94e92a,I5391ac49,If074bed1
...
* changes:
DO NOT MERGE Fix AppOpsServiceTest
DO NOT MERGE Don't throw exception in AppOpsManager.checkOp
DO NOT MERGE Remove unnecessary internal APIs.
DO NOT MERGE SetMode: Don't call into PM with AppOps lock held
2020-01-15 19:01:15 +00:00
Ameer Armaly
da9a56b5fb
Merge "Single-finger multi-tap: complete immediately rather than after a delay."
2020-01-15 18:54:40 +00:00
Nikita Dubrovsky
e6cf79bcab
Merge "Enable cursor drag by default for editable TextViews"
2020-01-15 18:52:56 +00:00
Ruchir Rastogi
8d3ec4a6c6
Merge "Migrate BuildInformation puller to new API"
2020-01-15 18:52:29 +00:00
Shuo Qian
725c54065d
Merge "Cleanup ITelephony in TelephonyPermissions with new System API. This method is used by Telephony Module for permission checking."
2020-01-15 18:51:54 +00:00
Nikita Dubrovsky
ca73951a92
Merge "Add explicit check to not trigger a cursor drag via the mouse"
2020-01-15 18:46:59 +00:00
Automerger Merge Worker
723cf79d04
Merge "Statically include @StringDef in IKE module" am: 259781e84a am: 3cd4501529 am: f49f206a02
...
Change-Id: Icb47ca3f788fd1ba6410156ae754ef995bf8f609
2020-01-15 18:41:29 +00:00
Automerger Merge Worker
ac99a517d6
[automerger skipped] Merge "System API proxies for the telephony module" am: 48564ac144 am: 9c7c247d3d am: e721ab2502 -s ours
...
am skip reason: Change-Id I6109aef77171346ecb103c190526b7b9b81012b2 with SHA-1 944aeffa85
2020-01-15 18:41:03 +00:00
Automerger Merge Worker
02c9c6a77e
[automerger skipped] Merge changes from topic "networkscoremanager-cachefilter" am: 427cb398e2 am: 17d1e1e11a am: 8a3cb6d09e -s ours
...
am skip reason: Change-Id I2db3c9746da2a460f6fb8964662859e8d80148e8 with SHA-1 d6705d929b
2020-01-15 18:40:35 +00:00
Automerger Merge Worker
7513732179
[automerger skipped] NetworkScoreManager: Expose SCORE_FILTER_* consts am: 16fc91a1c1 am: 51564c0050 am: 9cfa347e01 -s ours
...
am skip reason: Change-Id I9eab2e84d0b00fada7629a104566c1099f8b1288 with SHA-1 bc81782bb1
2020-01-15 18:40:28 +00:00
Automerger Merge Worker
de38d0529f
Merge "Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer" am: 7fd95f64df am: 4a76965c68 am: b8a357c250
...
Change-Id: I9aee20185e189e51d537b6b0895fdc31c31d0ea2
2020-01-15 18:39:33 +00:00
Automerger Merge Worker
f49f206a02
Merge "Statically include @StringDef in IKE module" am: 259781e84a am: 3cd4501529
...
Change-Id: I9a9913fa0377534a803bf179ac03d5db284ec579
2020-01-15 18:32:34 +00:00
Yan Yan
3cd4501529
Merge "Statically include @StringDef in IKE module"
...
am: 259781e84a
2020-01-15 10:26:23 -08:00
Automerger Merge Worker
e721ab2502
Merge "System API proxies for the telephony module" am: 48564ac144 am: 9c7c247d3d
...
Change-Id: I3b5f389b42ed8267ceb4f68bf9867eb18dec8055
2020-01-15 18:26:14 +00:00
Automerger Merge Worker
8a3cb6d09e
Merge changes from topic "networkscoremanager-cachefilter" am: 427cb398e2 am: 17d1e1e11a
...
Change-Id: Ic12be3e4dbdd9a6c1bc8b8516e3f0a6e6cc29357
2020-01-15 18:25:48 +00:00
Automerger Merge Worker
9cfa347e01
NetworkScoreManager: Expose SCORE_FILTER_* consts am: 16fc91a1c1 am: 51564c0050
...
Change-Id: I9532ed9e27aa83cc90b2e04fa5c6e330891dbc33
2020-01-15 18:25:42 +00:00
Automerger Merge Worker
b8a357c250
Merge "Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer" am: 7fd95f64df am: 4a76965c68
...
Change-Id: I71d047b955cbb80519bca4cd15d4638dec3dc812
2020-01-15 18:24:31 +00:00
Neil Fuller
9c7c247d3d
Merge "System API proxies for the telephony module"
...
am: 48564ac144
2020-01-15 10:20:36 -08:00
TreeHugger Robot
7e0817d906
Merge "Tethering: build tethering as unbundled APP"
2020-01-15 18:20:25 +00:00
David Su
17d1e1e11a
Merge changes from topic "networkscoremanager-cachefilter"
...
am: 427cb398e2
2020-01-15 10:18:16 -08:00
David Su
51564c0050
NetworkScoreManager: Expose SCORE_FILTER_* consts
...
am: 16fc91a1c1
2020-01-15 10:18:07 -08:00
TreeHugger Robot
775281766a
Merge "Use APk-in-APEX for PermissionController."
2020-01-15 18:17:38 +00:00
Nikita Ioffe
32add5ab42
Merge "Add shell commands to start checkpoint/check it is supported"
2020-01-15 18:16:29 +00:00
Yan Yan
259781e84a
Merge "Statically include @StringDef in IKE module"
2020-01-15 18:16:00 +00:00
Rambo Wang
4a76965c68
Merge "Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer"
...
am: 7fd95f64df
2020-01-15 10:08:51 -08:00
TreeHugger Robot
72a4075c43
Merge "Migrate pullKernelWakelock"
2020-01-15 18:04:50 +00:00
Neil Fuller
48564ac144
Merge "System API proxies for the telephony module"
2020-01-15 18:04:31 +00:00
Evan Severson
4e49a5d0b3
Merge "Add new api to get the button label for background permission"
2020-01-15 17:59:34 +00:00
David Su
427cb398e2
Merge changes from topic "networkscoremanager-cachefilter"
...
* changes:
SettingsLib: Rename CACHE_FILTER_* to SCORE_FILTER_*
NetworkScoreManager: Expose SCORE_FILTER_* consts
2020-01-15 17:55:35 +00:00
