drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
451,975 Commits 1 Branch 0 Tags
Commit Graph

451975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
a7948ddcb9 Merge "Explicitly take flags in createContextAsUser()" 2019-11-21 15:53:59 +00:00
Jay Aliomer
4132a00ab2 Merge "Unit tests for Override default assistant" 2019-11-21 15:37:55 +00:00
Issei Suzuki
17c36347cc Merge "Clean up visibility related flags in ActivityRecord" 2019-11-21 14:53:41 +00:00
satayev
57db484acb Merge "Add OWNERS for frameworks/base/config/hiddenapi*." am: 2c3312dda8 am: 677b6b6c3c 
am: cc37f4bdf6

Change-Id: I4cd6adf9ce5e1888f14074b0e93a5628b751bf60
 2019-11-21 06:50:58 -08:00
satayev
cc37f4bdf6 Merge "Add OWNERS for frameworks/base/config/hiddenapi*." am: 2c3312dda8 
am: 677b6b6c3c

Change-Id: Ica2204b8cb7de20b018113f96f850edc110a727f
 2019-11-21 06:43:29 -08:00
satayev
677b6b6c3c Merge "Add OWNERS for frameworks/base/config/hiddenapi*." 
am: 2c3312dda8

Change-Id: Ic490a254f257edc2b826f87e23fa3228af2a5e3a
 2019-11-21 06:36:00 -08:00
satayev
2c3312dda8 Merge "Add OWNERS for frameworks/base/config/hiddenapi*." 2019-11-21 14:26:40 +00:00
David Castro
27f1afdda0 Merge "Removed the confusing note as per guidance from mylesgw@ in BUG:117309989." into qt-dev am: 8bd0310456 am: 6d62047661 am: e93ab1d3ee 
am: 345de96beb

Change-Id: Ifb4c0e5a0dbf865c75864dedc9d6b58d6c5e11a9
 2019-11-21 05:08:26 -08:00
Martijn Coenen
9638d153c9 Merge "Don't hold sProxyLock while retrieving interface descriptors." into qt-qpr1-dev am: 69b6876c58 
am: 452feaf477

Change-Id: I8ca2cd22a53bf0a15442447fbdba1981fd2aa7df
 2019-11-21 05:03:22 -08:00
Chalard Jean
5d33d00a6e Merge "Cut the dependency to APN constants" am: 8f0513bd0b am: 28df771bd4 
am: 72cd1fa27a

Change-Id: I71f8a944fcb8b3d8199296aef67251b50abe6172
 2019-11-21 05:00:52 -08:00
David Castro
345de96beb Merge "Removed the confusing note as per guidance from mylesgw@ in BUG:117309989." into qt-dev am: 8bd0310456 am: 6d62047661 
am: e93ab1d3ee

Change-Id: Ie0b77841701c25534cb181a0f25ba1a4ee6262be
 2019-11-21 05:00:02 -08:00
Martijn Coenen
452feaf477 Merge "Don't hold sProxyLock while retrieving interface descriptors." into qt-qpr1-dev 
am: 69b6876c58

Change-Id: I770189a0a4a04d66d1d7e1d70d54404e0a6e1998
 2019-11-21 04:56:49 -08:00
Chalard Jean
72cd1fa27a Merge "Cut the dependency to APN constants" am: 8f0513bd0b 
am: 28df771bd4

Change-Id: I97f01b82916e66673339bef437d80927e78282ee
 2019-11-21 04:52:31 -08:00
David Castro
e93ab1d3ee Merge "Removed the confusing note as per guidance from mylesgw@ in BUG:117309989." into qt-dev am: 8bd0310456 
am: 6d62047661

Change-Id: I5c57f96546f33a7746013fc1ae23332d8e5014b7
 2019-11-21 04:52:27 -08:00
Chalard Jean
28df771bd4 Merge "Cut the dependency to APN constants" 
am: 8f0513bd0b

Change-Id: I140f294e0b044c66b925ae5c8ae6f2859c694753
 2019-11-21 04:45:07 -08:00
David Castro
6d62047661 Merge "Removed the confusing note as per guidance from mylesgw@ in BUG:117309989." into qt-dev 
am: 8bd0310456

Change-Id: Ib5d2d07b77e57d65bb5b028773ed063606247a16
 2019-11-21 04:45:04 -08:00
TreeHugger Robot
69b6876c58 Merge "Don't hold sProxyLock while retrieving interface descriptors." into qt-qpr1-dev 2019-11-21 12:42:42 +00:00
Chalard Jean
8f0513bd0b Merge "Cut the dependency to APN constants" 2019-11-21 12:37:33 +00:00
TreeHugger Robot
8bd0310456 Merge "Removed the confusing note as per guidance from mylesgw@ in BUG:117309989." into qt-dev 2019-11-21 12:37:08 +00:00
Artur Satayev
9dadbaa617 Add OWNERS for frameworks/base/config/hiddenapi*. 
Test: N/A
Change-Id: Iaf914899686ea6e8be7462f0c1df0646c4fa69b0
Merged-In: Iaf914899686ea6e8be7462f0c1df0646c4fa69b0
 2019-11-21 12:21:12 +00:00
vichang
211e2b65c3 [automerger skipped] Merge "Deprecate the use of ICU.addLikelySubtags" am: 986c242b7a am: c27cc4041b 
am: 35f3e83e87 -s ours
am skip reason: change_id I25ad003c70b5028942d50d8e83d1cc62ee74d31b with SHA1 57e23f19e6 is in history

Change-Id: Id8f14a16f58121977be93be5650e33a35e1ce1df
 2019-11-21 04:20:32 -08:00
vichang
35f3e83e87 Merge "Deprecate the use of ICU.addLikelySubtags" am: 986c242b7a 
am: c27cc4041b

Change-Id: I35a5dd3715d64316672b77ca79d69e2269f82cf6
 2019-11-21 04:12:33 -08:00
vichang
c27cc4041b Merge "Deprecate the use of ICU.addLikelySubtags" 
am: 986c242b7a

Change-Id: I86af54c4b0ca2d311a3ef1290972b47b5ddb0f8b
 2019-11-21 04:05:33 -08:00
Linus Tufvesson
7bb27de066 Sort properties by keys 
'device_config list' is printing the values sorted
'device_config list <namespace>' should do the same.

Test: Manually verified
Change-Id: I6b1f65161e56f5299a74b7c0942cef3a4d16d3d9
 2019-11-21 12:02:02 +00:00
vichang
986c242b7a Merge "Deprecate the use of ICU.addLikelySubtags" 2019-11-21 11:25:28 +00:00
Mohammad Samiul Islam
2dfc86af90 Rebrand the term "rollback" to "revert" for apexd 
StagingManager is a client of apexd. Rebrand in apexd requires we make
similar changes in StagingManager.

Bug: 144831762
Test: Builds without error
Change-Id: Idf2104e76a89bd8cd08778ca53129377255031af
 2019-11-21 11:10:20 +00:00
Bernardo Rufino
540ad7a28f Add TEST_MAPPINGs for toasts 
Following revert of ag/9699132 due to related broken tests that weren't
executed in presubmit.

Test: croot frameworks/base/core/java/android/app && atest --dry-run --test-mapping
Test: croot frameworks/base/core/java/android/widget && atest --dry-run --test-mapping
Test: croot frameworks/base/services/core/java/com/android/server && atest --dry-run --test-mapping
Change-Id: I819cf354315e240b28dba294c08cf08bba6aada2
 2019-11-21 10:28:22 +00:00
Chalard Jean
1d75893828 Merge changes I52f70756,Icc621f0a am: 0a8b713266 am: ed4371c546 
am: 394c2479d5

Change-Id: I7cfd5d6ba67a61ade33cb036250f598811a05b06
 2019-11-21 01:03:56 -08:00
Chalard Jean
394c2479d5 Merge changes I52f70756,Icc621f0a am: 0a8b713266 
am: ed4371c546

Change-Id: I1549ecd1361ee299073127e64108313872ed51b4
 2019-11-21 00:56:08 -08:00
Chalard Jean
ed4371c546 Merge changes I52f70756,Icc621f0a 
am: 0a8b713266

Change-Id: Idd877fbaaec711e379e3387efb5810e14508f2a1
 2019-11-21 00:48:38 -08:00
Chalard Jean
0a8b713266 Merge changes I52f70756,Icc621f0a 
* changes:
  [NS A08] Tiny refactoring
  [NS A07] Move the last side effects out of the decision loop.
 2019-11-21 08:32:35 +00:00
TreeHugger Robot
2f6c5fe32f Merge changes from topic "broadcast_multiple_perm" 
* changes:
  AndroidKeyStoreProvider: Add @throws documentation
  RemoteException: Add @throws documentation
  Context: Rename Context.sendBroadcastMultiplePermissions
 2019-11-21 06:28:10 +00:00
TreeHugger Robot
f6924b1c55 Merge "Adds new API to cancel current session" 2019-11-21 06:27:50 +00:00
Chalard Jean
c06d788ec9 Cut the dependency to APN constants 
With Telephony moving to Mainline these constants are not accessible
any more, and should not be made public. As they are only used by
a deprecated method that can only be called by apps with a target
SDK < M and only for one of the features it used to handle, copying
the constants until this method is completely removed is the simplest
way to go.

Test: FrameworksNetTests
Bug: 144454341
Change-Id: Iea18c8d2f2c8a40f04db9383d3f74b917267ba25
 2019-11-21 14:48:00 +09:00
Daniel Colascione
f9128861ec Merge changes from topic "property-handle" am: 54543bb423 am: 1077797c14 
am: d5e5232632

Change-Id: I23a5fe95b271a50d60546231a9facf59440bb2dd
 2019-11-20 21:02:31 -08:00
Meng Wang
cbb746d5fb Merge "Use TelephonyManager instead of ITelephony Binder" am: de953fd5f2 am: f1b067c671 
am: 33be3a80ea

Change-Id: I52c56a08092297b45b57f37f258f38ef5d93b393
 2019-11-20 20:59:54 -08:00
Daniel Colascione
d5e5232632 Merge changes from topic "property-handle" am: 54543bb423 
am: 1077797c14

Change-Id: I7e47fe571f2be140a76437c30b44e74619840d32
 2019-11-20 20:55:19 -08:00
Meng Wang
33be3a80ea Merge "Use TelephonyManager instead of ITelephony Binder" am: de953fd5f2 
am: f1b067c671

Change-Id: Iba67484246e81361ed540592558371cd7f2352c6
 2019-11-20 20:51:54 -08:00
Daniel Colascione
1077797c14 Merge changes from topic "property-handle" 
am: 54543bb423

Change-Id: Id1ebdeca53c8705ce3cfab8db2e25cfebaa7f8a3
 2019-11-20 20:47:44 -08:00
Meng Wang
f1b067c671 Merge "Use TelephonyManager instead of ITelephony Binder" 
am: de953fd5f2

Change-Id: I6172adeb2489abede44555b17340a6e58e23fafe
 2019-11-20 20:44:19 -08:00
Bill Yi
dada8a6f02 Import translations. DO NOT MERGE 
Change-Id: I4dd3f80e76bd3d9131c54941f4f4c36b4c116d5c
Auto-generated-cl: translation import
 2019-11-20 20:43:38 -08:00
Daniel Colascione
54543bb423 Merge changes from topic "property-handle" 
* changes:
  Add new SystemProperties.Handle interface
  Reimplement android.os.SystemProperties in terms of libc facilities
 2019-11-21 04:38:03 +00:00
Meng Wang
de953fd5f2 Merge "Use TelephonyManager instead of ITelephony Binder" 2019-11-21 04:36:10 +00:00
TreeHugger Robot
2ca0e7b2ee Merge changes from topic "settings_injection_v2" 
* changes:
  [SettingsLib] Support pure switch of inline toggle of Settings Injection v2
  Add new interfaces for inline toggle of Settings Injection v2
 2019-11-21 04:35:28 +00:00
Chalard Jean
7e0ad06508 Merge changes I493b969c,I7b759425,I60fe318a,Ie4ae6a97,I2379e47b, ... am: e2427502f1 am: b492ba5333 
am: 34734113e0

Change-Id: Ia1b3c12a96df2774bc780e58d1c6748e1f61e180
 2019-11-20 20:28:29 -08:00
Chalard Jean
34734113e0 Merge changes I493b969c,I7b759425,I60fe318a,Ie4ae6a97,I2379e47b, ... am: e2427502f1 
am: b492ba5333

Change-Id: I11a181c4e378a41718843489a1ca286ddad2755d
 2019-11-20 20:16:46 -08:00
Chalard Jean
b492ba5333 Merge changes I493b969c,I7b759425,I60fe318a,Ie4ae6a97,I2379e47b, ... 
am: e2427502f1

Change-Id: Ic5b59cb5e23feaf7aac0075f16afa3da94d3628c
 2019-11-20 20:08:51 -08:00
Chalard Jean
e2427502f1 Merge changes I493b969c,I7b759425,I60fe318a,Ie4ae6a97,I2379e47b, ... 
* changes:
  [NS A06] Move more side effects out of the decision loop
  [NS A05] Move some side effects out of the network decision loop
  [NS A04] Store changes in rematchNetworkAndRequests in a map
  [NS A03] Remove mNetworkForRequestId
  [NS A02] Move the contents of mNetworkForRequestId to NRIs
  [NS A01] Add checks for the handler thread
 2019-11-21 04:00:19 +00:00
David Castro
7904f376bb Removed the confusing note as per guidance from mylesgw@ in 
BUG:117309989.

Change-Id: I07680c04798642d21420bbea5c6b592c1c741f43
 2019-11-21 03:44:32 +00:00
TreeHugger Robot
11f38a9609 Merge "Remove IBatteryStats call from setDozing" 2019-11-21 03:26:45 +00:00