Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
458,551 Commits 3 Branches 0 Tags
11d0a7fb46f76e07e70ccae708ebbd25d2c8e472
Commit Graph

27583 Commits

Author SHA1 Message Date
Automerger Merge Worker
11d0a7fb46 Merge changes If28f0be6,If0f80067 am: 96529ad7fc am: cf77c50b11 am: 1740e8698d 
Change-Id: I826f1f94ea62eb5bd93e5d7edcbe278c8247ae2d
 2020-01-07 07:31:36 +00:00
Automerger Merge Worker
1740e8698d Merge changes If28f0be6,If0f80067 am: 96529ad7fc am: cf77c50b11 
Change-Id: I3d554c7ac0cf77aa2a80655d77c0e5bfb737dbdc
 2020-01-07 07:16:15 +00:00
Lorenzo Colitti
96529ad7fc Merge changes If28f0be6,If0f80067 
* changes:
  Make LinkPropertiesTest pass, and fix an NPE.
  Add the DHCP server address to LinkProperties.
 2020-01-07 06:43:20 +00:00
TreeHugger Robot
61b4e7136e Merge "Made setPolicyDataEnabled a SystemApi" 2020-01-07 05:39:30 +00:00
Automerger Merge Worker
04b4c4613b Merge "isTetheringApnRequired's permission is wrong." am: 6297d2548d am: bdce8daaf6 am: 281310f168 
Change-Id: I7768a96a105d637c0293a0c94bc76967db722006
 2020-01-07 05:05:05 +00:00
Automerger Merge Worker
281310f168 Merge "isTetheringApnRequired's permission is wrong." am: 6297d2548d am: bdce8daaf6 
Change-Id: I8f261ea142bc8fe2b31dd95061f6fdcd50407977
 2020-01-07 04:50:50 +00:00
SongFerng Wang
6297d2548d Merge "isTetheringApnRequired's permission is wrong." 2020-01-07 04:34:59 +00:00
Peter Wang
9bacfe13f4 Merge "[Telephony Mainline] Expose getActiveSubscriptionIdList" 2020-01-07 04:15:30 +00:00
Automerger Merge Worker
8250be7908 Merge "Change TelephonyManager#isManualNetworkSelectionAllowed to system api" am: 03cbd5d35c am: 8c349cff44 am: 3ea281feb8 
Change-Id: Iee06212929aef212ec1087235c736afb54336f0a
 2020-01-07 03:31:20 +00:00
Automerger Merge Worker
3ea281feb8 Merge "Change TelephonyManager#isManualNetworkSelectionAllowed to system api" am: 03cbd5d35c am: 8c349cff44 
Change-Id: I02a786fbf6ea2b9378ba62159034ba42efb01e56
 2020-01-07 03:18:44 +00:00
Betty Chang
02141e80f7 Merge "[Mainline] Move the setAlwaysAllowMmsData from SubscriptionManager to TelephonyManager" 2020-01-07 02:41:52 +00:00
Tom Hsu
03cbd5d35c Merge "Change TelephonyManager#isManualNetworkSelectionAllowed to system api" 2020-01-07 02:24:31 +00:00
TreeHugger Robot
72874be4c7 Merge "Make SignalStrength constructor system APIs" 2020-01-07 02:10:35 +00:00
Automerger Merge Worker
af1eb246ef Merge "SMS service loads MMS config directly instead" am: 250a41a139 am: e93312767b 
Change-Id: I654b7a4b46f7f0795c0e39d364392e247edb174f
 2020-01-07 01:50:47 +00:00
Automerger Merge Worker
48c8548945 Merge "Expose SignalStrength.CREATOR" am: b0546af594 am: 9ca0d16b2e am: 3cfdaf97d4 
Change-Id: If794d46074f6e09e65717a90a4b4084d4b26cc12
 2020-01-07 01:32:54 +00:00
Treehugger Robot
250a41a139 Merge "SMS service loads MMS config directly instead" 2020-01-07 01:29:05 +00:00
Automerger Merge Worker
3cfdaf97d4 Merge "Expose SignalStrength.CREATOR" am: b0546af594 am: 9ca0d16b2e 
Change-Id: Ie785dcbdbe287ad6c4c7ecf94a2bb412bbce1408
 2020-01-07 01:20:38 +00:00
Automerger Merge Worker
2d3c66da00 Merge "Clean up SmsApplication and expose getDefaultSmsPackage" am: 2ada7fbac2 am: b128b793c7 am: cccf7a2b84 
Change-Id: Id3b15d9d4d58235034405c85b7e10fc42f3e4172
 2020-01-07 01:12:52 +00:00
Treehugger Robot
b0546af594 Merge "Expose SignalStrength.CREATOR" 2020-01-07 01:02:53 +00:00
Automerger Merge Worker
cccf7a2b84 Merge "Clean up SmsApplication and expose getDefaultSmsPackage" am: 2ada7fbac2 am: b128b793c7 
Change-Id: Icee2c41d635883c6b9ede6bf6ec3bbfda22cdc1f
 2020-01-07 01:01:54 +00:00
Hall Liu
2ada7fbac2 Merge "Clean up SmsApplication and expose getDefaultSmsPackage" 2020-01-07 00:36:51 +00:00
Taesu Lee
5f39e5d863 SMS service loads MMS config directly instead 
getCarrierConfigValues() is removed from MmsManager and SMS service
loads Carrier configuration values directly since MmsService could
return null or cached config instead if an app requests the config by
receiving ACTION_CARRIER_CONFIG_CHANGED before the config is loaded
newly in MmsService by ACTION_CARRIER_CONFIG_CHANGED.

Bug: 145768042
Test: manual

Change-Id: Idc21015cab2902bd0f67e2131ea89b04c4fc4f5e
Merged-In: Idc21015cab2902bd0f67e2131ea89b04c4fc4f5e
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
 2020-01-07 00:12:54 +00:00
Sarah Chin
8bf65d078f Merge "SMS service loads MMS config directly instead" 2020-01-07 00:12:21 +00:00
Automerger Merge Worker
3db9e958ab Merge "Create new APIs for overriding APNs" am: 13beb87783 am: 4d1771a3fb 
Change-Id: I202aa723edabdca84eddb679233ac0dcf6cfacd2
 2020-01-07 00:10:24 +00:00
Peter Wang
5a07a245c9 [Telephony Mainline] Expose getActiveSubscriptionIdList 
Bug: 146362577
Fix: 146362577
Test: Build
Change-Id: Ic2886c8af0ef176cffcd674eb5b1a09cb49cc8f0
 2020-01-06 16:06:34 -08:00
David Su
6a3a7e9a33 Merge "Formalize WifiConfiguration copy constructor" 2020-01-06 23:50:27 +00:00
David Su
fa083fdc7f Formalize WifiConfiguration copy constructor 
Copy constructor is used by WifiTrackerLib.

Bug: 138801922
Test: compiles
Change-Id: Icec13c808b875cde9d8204d55996bb18d8da1eb4
 2020-01-06 15:32:31 -08:00
Hall Liu
13beb87783 Merge "Create new APIs for overriding APNs" 2020-01-06 23:14:44 +00:00
Taesu Lee
44fb1904e3 SMS service loads MMS config directly instead 
getCarrierConfigValues() is removed from MmsManager and SMS service
loads Carrier configuration values directly since MmsService could
return null or cached config instead if an app requests the config by
receiving ACTION_CARRIER_CONFIG_CHANGED before the config is loaded
newly in MmsService by ACTION_CARRIER_CONFIG_CHANGED.

Bug: 145768042
Test: manual

Change-Id: Idc21015cab2902bd0f67e2131ea89b04c4fc4f5e
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
 2020-01-06 15:09:48 -08:00
Jayachandran Chinnakkannu
0aaa6beedf Merge "Make the following telephony intents as system API" 2020-01-06 22:00:32 +00:00
Songchun Fan
70d860e333 Merge "Make Context.ACTION_LOAD_DATA a system API" 2020-01-06 21:53:06 +00:00
Automerger Merge Worker
29684009e9 Merge "Add fcntlInt to public API" am: f864a5a355 am: 0c53919e1b am: 09ed35b0ec 
Change-Id: Ic24a370192851c0334ebb1c673cc6b640243cc13
 2020-01-06 21:36:52 +00:00
Automerger Merge Worker
09ed35b0ec Merge "Add fcntlInt to public API" am: f864a5a355 am: 0c53919e1b 
Change-Id: Ifcc7fde7b837c89f2a6b1c998fc6d3e484aceeca
 2020-01-06 21:21:44 +00:00
Benedict Wong
f864a5a355 Merge "Add fcntlInt to public API" 2020-01-06 21:04:17 +00:00
Automerger Merge Worker
fee54edeff Merge "Mark DVB methods and classes as System APIs." am: 046609406d am: acb2a3c481 am: 9273dd9bc3 
Change-Id: I7eefa6698644e8584c4676e65a6507ee1668c6b4
 2020-01-06 20:51:18 +00:00
Automerger Merge Worker
9273dd9bc3 Merge "Mark DVB methods and classes as System APIs." am: 046609406d am: acb2a3c481 
Change-Id: I47c18f8c7cae7cca62440edcdb05913bc7dc5431
 2020-01-06 20:34:54 +00:00
TreeHugger Robot
8666b89c84 Merge "Move Slice into Dataset." 2020-01-06 19:50:55 +00:00
Chen Xu
03f00fc5c3 Merge "support data migration from OEM legacy app to mainline" 2020-01-06 19:05:49 +00:00
ruibin zhang
ad2689c1a1 Add the DHCP server address to LinkProperties. 
Bug: 134098566
Test: see subsequent CL in topic
Change-Id: If0f80067934189137c87cd379e7ae47b187562fd
 2020-01-07 01:21:07 +09:00
tom hsu
070f90cab2 Change TelephonyManager#isManualNetworkSelectionAllowed to system api 
Bug: 146036213
Test: make and atest pass
Change-Id: I185d4b1bb2061dbde3b18e6e9f0baf6461ff609d
 2020-01-06 16:03:21 +00:00
Adam He
3e01bc378b Move Slice into Dataset. 
Bug: 146453536
Test: manual verification
Change-Id: I6289622e01394c3bc9aa4dcd38feeb9ec2c33c55
 2020-01-06 07:47:28 -08:00
TreeHugger Robot
30b90101c7 Merge "Add NETWORK_AIRPLANE_MODE permission" 2020-01-06 14:15:46 +00:00
changbetty
8f823800d7 [Mainline] Move the setAlwaysAllowMmsData from SubscriptionManager to TelephonyManager 
Bug: 146309719
Test: make
Change-Id: Ibb68cd4e6a6ba49c56b313380ddf16734813459b
 2020-01-06 16:59:28 +08:00
Shafik Nassar
729e4d7422 Merge "Add permission for MANAGE_EXTERNAL_STORAGE AppOp" 2020-01-06 07:09:11 +00:00
Hall Liu
39839dc63b Create new APIs for overriding APNs 
Create new APIs in TelephonyManager for DevicePolicyManager to add
override APNs, and use them in DevicePolicyManagerService instead of
directly accessing the APN database.

Bug: 146834818
Test: cts-tradefed run cts --module DevicePolicyManager --test
com.android.cts.devicepolicy.DeviceOwnerTest#testOverrideApn
Test: atest TelephonyManagerTest

Change-Id: I6c6214424169c05fd452db71a8c6593f8473b9d4
Merged-In: I6c6214424169c05fd452db71a8c6593f8473b9d4
 2020-01-05 14:24:22 -08:00
Hall Liu
8106f9f511 Merge "Create new APIs for overriding APNs" 2020-01-05 21:55:41 +00:00
Philip P. Moltmann
54354063a9 Merge "Collect AsyncNotedAppOp in same call as noteOp" 2020-01-04 03:24:00 +00:00
TreeHugger Robot
24a4c411db Merge "Added attributes for IME and AutofillService to indicate they support inline suggestions." 2020-01-04 01:18:46 +00:00
Hall Liu
efc4962eba Create new APIs for overriding APNs 
Create new APIs in TelephonyManager for DevicePolicyManager to add
override APNs, and use them in DevicePolicyManagerService instead of
directly accessing the APN database.

Bug: 146834818
Test: cts-tradefed run cts --module DevicePolicyManager --test
com.android.cts.devicepolicy.DeviceOwnerTest#testOverrideApn
Test: atest TelephonyManagerTest

Change-Id: I6c6214424169c05fd452db71a8c6593f8473b9d4
 2020-01-03 17:09:11 -08:00
Jayachandran C
041e769c09 Make the following telephony intents as system API 
ACTION_REQUEST_OMADM_CONFIGURATION_UPDATE
ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED
ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED

Bug: 146680426
Test: Build
Change-Id: I8ba6d564347777204e2563f87a81f6b0b905d43f
 2020-01-03 16:43:23 -08:00