Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
459,091 Commits 3 Branches 0 Tags
b2ec442fa5de6fa505f3d3166bca68fad4fa8f55
Commit Graph

459091 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
b2ec442fa5 [automerger skipped] Merge "Handle 5G meteredness in telephony framework" into qt-qpr1-dev-plus-aosp am: 0b7efca5e6 -s ours 
am skip reason: Change-Id Ic8c5938c4a414ce63303a1fa25af60a0082b1ba9 with SHA-1 92860a704b is in history

Change-Id: If912092714e062e53a6bd581315a5bbeb9420c79
 2020-01-09 02:42:18 +00:00
Sarah Chin
0b7efca5e6 Merge "Handle 5G meteredness in telephony framework" into qt-qpr1-dev-plus-aosp 2020-01-09 02:23:13 +00:00
TreeHugger Robot
f959a31907 Merge "Allow zero stride" 2020-01-09 02:23:00 +00:00
Sarah Chin
e8aa5acef5 Handle 5G meteredness in telephony framework 
Carriers can set override values via SubscriptionManager.
Added constants and configs for 5G meteredness updates.

Bug: 139070884
Bug: 139218397
Test: atest FrameworksTelephonyTests
Test: atest
cts/tests/tests/telephony/current/src/android/telephony/cts/SubscriptionManagerTest.java

Change-Id: Ic8c5938c4a414ce63303a1fa25af60a0082b1ba9
Merged-In: Ic8c5938c4a414ce63303a1fa25af60a0082b1ba9
(cherry-picked from ag/9302701)
 2020-01-09 02:13:26 +00:00
TreeHugger Robot
85e2fafccd Merge "Split FilterConfiguration and move to filter package" 2020-01-09 01:45:51 +00:00
TreeHugger Robot
0b94e6b49e Merge "Use preview_sdk_int for version code checks" 2020-01-09 01:38:35 +00:00
TreeHugger Robot
b023c08b65 Merge "Move ScanMessage to frontend package" 2020-01-09 01:28:01 +00:00
Automerger Merge Worker
f0c149099d Merge "Annotating a class with @SystemApi makes its members @SystemApi" am: 9c8b644b83 am: 6813b8a90b am: 6c1921ece5 
Change-Id: I85329e6252dfa71d247f10d26d9a8e07cddf9c2b
 2020-01-09 01:16:41 +00:00
JW Wang
024552b71a Merge changes Ib9c5e3f5,I4104d202 
* changes:
  Clean up rollbacks after each test (2/n)
  Rewrite and re-enable the test (1/n)
 2020-01-09 01:06:50 +00:00
Automerger Merge Worker
6c1921ece5 Merge "Annotating a class with @SystemApi makes its members @SystemApi" am: 9c8b644b83 am: 6813b8a90b 
Change-Id: Id7743c7f66d10f9eeebeb16772edcd9fe80bcc5c
 2020-01-09 01:04:28 +00:00
Jiyong Park
6813b8a90b Merge "Annotating a class with @SystemApi makes its members @SystemApi" 
am: 9c8b644b83

Change-Id: I38f58a3d0694a26728c81b7e03e5877ecb6d3a22
 2020-01-08 16:50:37 -08:00
TreeHugger Robot
c10a8f038f Merge "Remove DurationTracker cloning functions" 2020-01-09 00:46:31 +00:00
Treehugger Robot
9c8b644b83 Merge "Annotating a class with @SystemApi makes its members @SystemApi" 2020-01-09 00:45:50 +00:00
Anders Frostad Pedersen
ffd8cb89e0 Allow zero stride 
For some pixel formats, stride has no meaning.
Take this into account and use buffer width instead.

Bug: 143470518
Change-Id: I728b40803e80c4e534504c5b9db55921bb5e7dbc
Test: android.graphics.cts.ImageDecoderTest#testConserveMemoryPlusHardware
 2020-01-08 16:44:10 -08:00
Hai Shalom
3b4792a487 Merge "[SAE] Add support to add SAE Authentication algorithm" 2020-01-09 00:40:08 +00:00
Automerger Merge Worker
3e5cf0eb2c Merge "Refactor NetworkFactoryInfo to hide implementation details." am: dd3358b258 am: c8e05aed7e am: b8d2a52f89 
Change-Id: I58cc18e279a6376256e99d24df83583293a89fc0
 2020-01-09 00:39:49 +00:00
Automerger Merge Worker
da4cc871f2 [automerger skipped] Merge "[Telephony Mainline] Move TelephonyUtils to telephony/common" am: 24a3f6a6cd am: 1430e17814 am: 5bf20b018c -s ours 
am skip reason: Change-Id I94764fcf698477285ea366c5c7e90e7bd8a27eb3 with SHA-1 2c3caed036 is in history

Change-Id: I989a6f684e5a9732776c752f3acacf0839e66f2c
 2020-01-09 00:39:15 +00:00
Automerger Merge Worker
e2a1e6d946 [automerger skipped] Merge changes from topics "141018421_set3", "146905502", "remove_getPhoneId" am: 939d3d62cd am: 69804facae am: 6c04e82b30 -s ours 
am skip reason: Change-Id Ia318ada2e478dbb24349119203b7869d23342ee5 with SHA-1 00f7b72c88 is in history

Change-Id: If7a6527ee866e6062e91e86f43f9779bf428383f
 2020-01-09 00:38:07 +00:00
Automerger Merge Worker
ce5aa81fbc [automerger skipped] Expose setUiccApplicationsEnabled as @SystemApi for eSIM to call upon slot mapping change. am: 4ece3db113 am: cd6845de02 am: 4d4abe7a8f -s ours 
am skip reason: Change-Id I9844e71260ea009afd0928a0f4be4426e7d12358 with SHA-1 b44763419b is in history

Change-Id: I025389fa3bd08f126230ebb83a217922eb75f062
 2020-01-09 00:38:02 +00:00
Automerger Merge Worker
432b7612b9 [automerger skipped] Mainline: remove usage of hiddepn API SubscriptionManager#getPhoneId am: 443ba6fc8d am: a0edd2f6eb am: 85540eab22 -s ours 
am skip reason: Change-Id Ia997291dc13487dad43519641369b4a357614602 with SHA-1 e4275585c0 is in history

Change-Id: I07254424d9becf34df8af0d56e917d3b0f5c4e35
 2020-01-09 00:37:51 +00:00
Automerger Merge Worker
06c9053483 [automerger skipped] Merge "DO NOT MERGE - Temporary fix to disable augmented autofill requests coming from password fields." into qt-qpr1-dev am: 59fbd30e4f am: cd66d8cbe8 -s ours 
am skip reason: subject contains skip directive

Change-Id: I0e23b1c0c99961c17b9f7b271b90d07e4820b3e4
 2020-01-09 00:36:27 +00:00
Automerger Merge Worker
6dd307803a [automerger skipped] DO NOT MERGE - Temporary fix to disable augmented autofill requests coming from am: 514271fd61 am: 4bc70a0050 -s ours 
am skip reason: subject contains skip directive

Change-Id: I8dfc67edf625242cba5ad40cdb29c6f0b23a4cef
 2020-01-09 00:34:24 +00:00
Automerger Merge Worker
e14402b3e2 Merge "PersistableBundle: writeToStream/readFromStream" am: 0204e4a08e am: 083df1ec90 am: 869646b5ab 
Change-Id: I059547d4a8ed075c82cf483b2b226b3e337203c2
 2020-01-09 00:33:44 +00:00
Automerger Merge Worker
b8d2a52f89 Merge "Refactor NetworkFactoryInfo to hide implementation details." am: dd3358b258 am: c8e05aed7e 
Change-Id: Iaeb14fca8a4a775253494eb783ddcbb83694dc7b
 2020-01-09 00:22:45 +00:00
Automerger Merge Worker
5bf20b018c Merge "[Telephony Mainline] Move TelephonyUtils to telephony/common" am: 24a3f6a6cd am: 1430e17814 
Change-Id: I383cb9d0462d9bc9574769210532e4988965fff0
 2020-01-09 00:22:22 +00:00
Automerger Merge Worker
6c04e82b30 Merge changes from topics "141018421_set3", "146905502", "remove_getPhoneId" am: 939d3d62cd am: 69804facae 
Change-Id: I024e8d46492c7a40a30cd6aa036df2ddee1623ce
 2020-01-09 00:21:44 +00:00
Automerger Merge Worker
4d4abe7a8f Expose setUiccApplicationsEnabled as @SystemApi for eSIM to call upon slot mapping change. am: 4ece3db113 am: cd6845de02 
Change-Id: I2ccf309efd24c561cf35d8e54a139d84250d2746
 2020-01-09 00:21:32 +00:00
Automerger Merge Worker
85540eab22 Mainline: remove usage of hiddepn API SubscriptionManager#getPhoneId am: 443ba6fc8d am: a0edd2f6eb 
Change-Id: I4dfa0e031ab315e3a7464a95cb8c098ac29b2ded
 2020-01-09 00:21:23 +00:00
TreeHugger Robot
bdac9311bb Merge "Keep subscibers when configs are deleted" 2020-01-09 00:21:19 +00:00
Automerger Merge Worker
cd66d8cbe8 Merge "DO NOT MERGE - Temporary fix to disable augmented autofill requests coming from password fields." into qt-qpr1-dev am: 59fbd30e4f 
Change-Id: I7184a93cb358579b1cc33d90bdeb6a11eee39d57
 2020-01-09 00:20:44 +00:00
Automerger Merge Worker
4bc70a0050 DO NOT MERGE - Temporary fix to disable augmented autofill requests coming from am: 514271fd61 
Change-Id: I31e7770a1ae348b9326698061ee952212a89bea2
 2020-01-09 00:20:00 +00:00
Lorenzo Colitti
c8e05aed7e Merge "Refactor NetworkFactoryInfo to hide implementation details." 
am: dd3358b258

Change-Id: Ide91a79a0d817efe408b9f85860178c9975a63bd
 2020-01-08 16:19:27 -08:00
Automerger Merge Worker
869646b5ab Merge "PersistableBundle: writeToStream/readFromStream" am: 0204e4a08e am: 083df1ec90 
Change-Id: I8823618f688d781f5a96549da695b45b0f561878
 2020-01-09 00:19:20 +00:00
Meng Wang
1b3499c83c Merge "System API used by telephony to bind to WapPushManager app." 2020-01-09 00:18:53 +00:00
Peter Wang
1430e17814 Merge "[Telephony Mainline] Move TelephonyUtils to telephony/common" 
am: 24a3f6a6cd

Change-Id: I0fbbbea5ad9abd70e293047291b048885e68f7f0
 2020-01-08 16:13:37 -08:00
TreeHugger Robot
7304df0c07 Merge "wificond: Mark wificond service name a @SystemApi" 2020-01-09 00:11:46 +00:00
Muhammad Qureshi
b6f32d9fe2 Use preview_sdk_int for version code checks 
Don't use Build.VERSION.CODENAME to check for R.
Use Build.VERSION.SDK_INT > Q || (Build.VERSION.SDK_INT == Q &&
        Build.VERSION.PREVIEW_SDK_INT > 0)

Bug: 146235828
Test: m DocumentsUIGoogle

Change-Id: I59e327d4e92d41a93b6bea145b8497fd4f85108c
 2020-01-08 16:10:57 -08:00
Lorenzo Colitti
dd3358b258 Merge "Refactor NetworkFactoryInfo to hide implementation details." 2020-01-09 00:10:47 +00:00
Xiangyu/Malcolm Chen
69804facae Merge changes from topics "141018421_set3", "146905502", "remove_getPhoneId" 
am: 939d3d62cd

Change-Id: Ib7278432e8564c0123c64cdc4934f280e528e687
 2020-01-08 16:08:26 -08:00
Malcolm Chen
cd6845de02 Expose setUiccApplicationsEnabled as @SystemApi for eSIM to call upon slot mapping change. 
am: 4ece3db113

Change-Id: I06d6c9bf6dfda3a7a95de3d70220ea9d838e4916
 2020-01-08 16:08:17 -08:00
Malcolm Chen
a0edd2f6eb Mainline: remove usage of hiddepn API SubscriptionManager#getPhoneId 
am: 443ba6fc8d

Change-Id: Ie557d2f515b08635e3dfd24079c1caf8bac5accd
 2020-01-08 16:08:06 -08:00
Peter Wang
eeea33fb80 Merge "[Telephony Mainline] Expose APIs in SubscriptionManager" 2020-01-09 00:07:48 +00:00
Meng Wang
083df1ec90 Merge "PersistableBundle: writeToStream/readFromStream" 
am: 0204e4a08e

Change-Id: I52a1323e4157a0c967c301d48a646ea6ba94647c
 2020-01-08 16:04:41 -08:00
TreeHugger Robot
59fbd30e4f Merge "DO NOT MERGE - Temporary fix to disable augmented autofill requests coming from password fields." into qt-qpr1-dev 2020-01-09 00:02:49 +00:00
TreeHugger Robot
c21302c803 Merge "Move a bunch of row setters into an init method." 2020-01-08 23:59:16 +00:00
TreeHugger Robot
f3aa6c62ef Merge "Convert NotificationContentInflater to singleton" 2020-01-08 23:58:54 +00:00
Peter Wang
24a3f6a6cd Merge "[Telephony Mainline] Move TelephonyUtils to telephony/common" 2020-01-08 23:58:23 +00:00
Peter Wang
3e2fb955a8 Merge "[Telephony Mainline] Refactored ServiceManager calls" 2020-01-08 23:57:48 +00:00
TreeHugger Robot
0896239ac6 Merge "Key DurationMetric trackers directly to dimensions_in_what keys" 2020-01-08 23:57:11 +00:00
Xiangyu/Malcolm Chen
939d3d62cd Merge changes from topics "141018421_set3", "146905502", "remove_getPhoneId" 
* changes:
  Make sanitizeLocationInfo System Api.
  Expose setUiccApplicationsEnabled as @SystemApi for eSIM to call upon slot mapping change.
  Mainline: remove usage of hiddepn API SubscriptionManager#getPhoneId
 2020-01-08 23:51:48 +00:00