Automerger Merge Worker
dfb54bde22
Merge "Remove @hide for CarrierConfigManager constants" am: f1de6ef70b am: 4dc40c8ced
...
Change-Id: I6ceeadc17bdb17b28613a07549319cd4e9c6c1f5
2020-01-15 22:16:19 +00:00
Sarah Chin
4dc40c8ced
Merge "Remove @hide for CarrierConfigManager constants"
...
am: f1de6ef70b
2020-01-15 14:03:55 -08:00
Sarah Chin
f1de6ef70b
Merge "Remove @hide for CarrierConfigManager constants"
2020-01-15 21:40:35 +00:00
Automerger Merge Worker
3e2801d77d
Merge "Add javadoc @see to methods affected by resetAllCarrierActions" am: aa7d4c540d am: ecc022802a
...
Change-Id: I4a7d46ff9f1baaf90ce23bb8d3a8035823ac70b2
2020-01-15 21:40:28 +00:00
Michele
ecc022802a
Merge "Add javadoc @see to methods affected by resetAllCarrierActions"
...
am: aa7d4c540d
2020-01-15 13:20:02 -08:00
Treehugger Robot
aa7d4c540d
Merge "Add javadoc @see to methods affected by resetAllCarrierActions"
2020-01-15 21:15:13 +00:00
Automerger Merge Worker
c5bfdd62c9
Merge "Use non-wakeup alarm for delay constraint." am: 3f9e9efe46 am: 3ade229c1c
...
Change-Id: I1232500c5f954ce757c1371ef2d9eeedb2987728
2020-01-15 20:29:41 +00:00
Kweku Adams
3ade229c1c
Merge "Use non-wakeup alarm for delay constraint."
...
am: 3f9e9efe46
2020-01-15 12:12:25 -08:00
Treehugger Robot
3f9e9efe46
Merge "Use non-wakeup alarm for delay constraint."
2020-01-15 20:07:43 +00:00
Automerger Merge Worker
8ed7da2b52
Merge "Statically link AsyncChannel/AsyncService in telephony" am: ff3210b045 am: 08b5032d41
...
Change-Id: I8ecccf7031c8ecfc02bbe4dec0775d3002f7c992
2020-01-15 19:58:22 +00:00
Meng Wang
08b5032d41
Merge "Statically link AsyncChannel/AsyncService in telephony"
...
am: ff3210b045
2020-01-15 11:39:11 -08:00
Treehugger Robot
ff3210b045
Merge "Statically link AsyncChannel/AsyncService in telephony"
2020-01-15 19:35:22 +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
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
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
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
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
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
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
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
Neil Fuller
48564ac144
Merge "System API proxies for the telephony module"
2020-01-15 18:04:31 +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
Rambo Wang
7fd95f64df
Merge "Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer"
2020-01-15 17:45:58 +00:00
Automerger Merge Worker
f2b5633071
Merge "Expose time / time zone system apis for telephony" am: e9dafe541e am: 76e21aa151
...
Change-Id: Ia6e446d686a1073295a35d39fe024df6f5d35e8f
2020-01-15 16:37:43 +00:00
Neil Fuller
76e21aa151
Merge "Expose time / time zone system apis for telephony"
...
am: e9dafe541e
2020-01-15 08:24:33 -08:00
Neil Fuller
e9dafe541e
Merge "Expose time / time zone system apis for telephony"
2020-01-15 16:19:16 +00:00
Automerger Merge Worker
a166b4c136
Merge "Use new UnsupportedAppUsage annotation." am: c764cb634d am: fcde297afb
...
Change-Id: I8d7ae39c3b292efb3ed55fe5743da2e5872f5890
2020-01-15 14:23:06 +00:00
Artur Satayev
fcde297afb
Merge "Use new UnsupportedAppUsage annotation."
...
am: c764cb634d
2020-01-15 06:03:02 -08:00
Treehugger Robot
c764cb634d
Merge "Use new UnsupportedAppUsage annotation."
2020-01-15 13:29:02 +00:00
Automerger Merge Worker
501bf0c983
Merge "[Wi-Fi] Add OWNER files for Wi-Fi test cases" am: 59555877e8 am: a4cbe551bc
...
Change-Id: I012075fbae8b05d6aa54792360a9f5d9be5106d7
2020-01-15 13:17:16 +00:00
Arc Wang
a4cbe551bc
Merge "[Wi-Fi] Add OWNER files for Wi-Fi test cases"
...
am: 59555877e8
2020-01-15 05:03:39 -08:00
Arc Wang
59555877e8
Merge "[Wi-Fi] Add OWNER files for Wi-Fi test cases"
2020-01-15 12:53:46 +00:00
Automerger Merge Worker
00356b8d79
Merge "Tethering: remove redundant source code" am: 7f9b3ca809 am: 69c72da2c7
...
Change-Id: I454f1021bc2a03853f6bc228c805aba99481eb19
2020-01-15 12:16:42 +00:00
Automerger Merge Worker
968f5a9665
Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi" am: dda5e92547 am: fe7146187e
...
Change-Id: Ic2168f237508137de450833d9c4a8f7229d89090
2020-01-15 12:16:25 +00:00
Mark Chien
69c72da2c7
Merge "Tethering: remove redundant source code"
...
am: 7f9b3ca809
2020-01-15 04:06:26 -08:00
paulhu
fe7146187e
Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi"
...
am: dda5e92547
2020-01-15 04:03:29 -08:00
