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

459123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
adf7e99baa Merge "Add addOnSubscriptionsChangedListener with an executor as a parameter" am: 6c64897b4e am: 3fef1ac0e8 am: 08293747be 
Change-Id: I351568382899993f43ec39ab205e5978acfa5e93
 2020-01-09 04:01:08 +00:00
Automerger Merge Worker
c62cfdcd81 [automerger skipped] Merge "MAP: Add string for BluetoothMapVersionPreferenceController" am: c7c465f407 am: d6e283452b am: b6d3a7babe -s ours 
am skip reason: Change-Id I3e82cabea772beca25f03de8b51d3a1bd9768a20 with SHA-1 263157916e is in history

Change-Id: I0e2889c7ad5a6b02d383c9aad0728cd639b59ecc
 2020-01-09 04:00:32 +00:00
Automerger Merge Worker
6a872aaf40 [automerger skipped] Merge "(Backport) Pipe through featureId from caller to permission checks in telephony code" am: 0104ce5293 am: f5a037d685 am: e576ba8f8d -s ours 
am skip reason: Change-Id I7ef41e8961e48d40e5685c4a521e83cb20953e48 with SHA-1 33692f734f is in history

Change-Id: I00a2bb2c2ee8f371e177c1a704a6d754d3ed8570
 2020-01-09 03:59:49 +00:00
Automerger Merge Worker
e864cfdb99 [automerger skipped] Merge "[Telephony Mainline] Make newFromBundle and fillInNotifierBundle System API" am: 593bd91f2c am: fd67572055 am: 2eabc68a4f -s ours 
am skip reason: Change-Id I84543dbb056694d975799c7959c7ed66e286c530 with SHA-1 8a8b120093 is in history

Change-Id: I2581cdc25d890a65e6f1e28e91587a782dbeca37
 2020-01-09 03:49:53 +00:00
Automerger Merge Worker
08293747be Merge "Add addOnSubscriptionsChangedListener with an executor as a parameter" am: 6c64897b4e am: 3fef1ac0e8 
Change-Id: Ife154aab45f1b3f2864898a872c5a5a0191f0a9f
 2020-01-09 03:47:00 +00:00
Automerger Merge Worker
b6d3a7babe Merge "MAP: Add string for BluetoothMapVersionPreferenceController" am: c7c465f407 am: d6e283452b 
Change-Id: I40ab042416acbd5646f7c835d98df27b29071949
 2020-01-09 03:46:22 +00:00
Automerger Merge Worker
e576ba8f8d Merge "(Backport) Pipe through featureId from caller to permission checks in telephony code" am: 0104ce5293 am: f5a037d685 
Change-Id: I09813d60dacabbd98e395816f9d7cb6d965a4f19
 2020-01-09 03:45:21 +00:00
Automerger Merge Worker
2eabc68a4f Merge "[Telephony Mainline] Make newFromBundle and fillInNotifierBundle System API" am: 593bd91f2c am: fd67572055 
Change-Id: I126c9f94973100d03020cd74931dfc62a41591dd
 2020-01-09 03:35:31 +00:00
TreeHugger Robot
9cb1238490 Merge "Update WmTests file docs" 2020-01-09 03:22:49 +00:00
Zongheng Wang
3fef1ac0e8 Merge "Add addOnSubscriptionsChangedListener with an executor as a parameter" 
am: 6c64897b4e

Change-Id: Id3e0dace3154489136a5dc36e19f240080a86dca
 2020-01-08 19:17:19 -08:00
TreeHugger Robot
8783053085 Merge "[Tether09] Use INetd to call netd directly" 2020-01-09 03:16:22 +00:00
Zongheng Wang
6c64897b4e Merge "Add addOnSubscriptionsChangedListener with an executor as a parameter" 2020-01-09 03:11:39 +00:00
Chienyuan
d6e283452b Merge "MAP: Add string for BluetoothMapVersionPreferenceController" 
am: c7c465f407

Change-Id: Ic57cf3676d6795049f0c255eb22a9cd90025696d
 2020-01-08 19:11:10 -08:00
Philip P. Moltmann
f5a037d685 Merge "(Backport) Pipe through featureId from caller to permission checks in telephony code" 
am: 0104ce5293

Change-Id: I8eee2a26fd6f397098edd4a673752d087c70edb6
 2020-01-08 19:06:27 -08:00
Xiangyu/Malcolm Chen
fd67572055 Merge "[Telephony Mainline] Make newFromBundle and fillInNotifierBundle System API" 
am: 593bd91f2c

Change-Id: Ic021d77c330ddfcc9be8914c7cc09b827ce67918
 2020-01-08 19:03:28 -08:00
Treehugger Robot
c7c465f407 Merge "MAP: Add string for BluetoothMapVersionPreferenceController" 2020-01-09 03:00:28 +00:00
Shubang Lu
e5c1319601 Merge "Add TimeFilter APIs" 2020-01-09 02:57:34 +00:00
TreeHugger Robot
9a32af4170 Merge "Use real package name in MemoryUsageTest" 2020-01-09 02:54:31 +00:00
TreeHugger Robot
f2473f4ff6 Merge "Fix summary cancel logic for experimental bubbles" 2020-01-09 02:52:30 +00:00
Sarah Chin
c26dc202c4 Merge "Make MmsManager public" 2020-01-09 02:51:47 +00:00
Treehugger Robot
0104ce5293 Merge "(Backport) Pipe through featureId from caller to permission checks in telephony code" 2020-01-09 02:48:14 +00:00
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
Xiangyu/Malcolm Chen
593bd91f2c Merge "[Telephony Mainline] Make newFromBundle and fillInNotifierBundle System API" 2020-01-09 02:37:56 +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
Andrii Kulian
f5d1411eb2 Update WmTests file docs 
Test: atest WmTests
Change-Id: Ic2881d0abb6423f549080e83517343874ebed04c
 2020-01-08 17:23:56 -08: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