Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
364,540 Commits 3 Branches 0 Tags
a481fdf08ffca434cfdfd2b6fb94be875e584506
Commit Graph

19866 Commits

Author SHA1 Message Date
Kweku Adams
bd62a2b5ea Merge "Removing the settings-based IncidentReportArgs method." into pi-dev am: 46c0e91b74 
am: 148d986e62

Change-Id: Ib8155edff17903fa6bf775c6809498f032ea611d
 2018-03-20 04:54:20 +00:00
Shuzhen Wang
ff1b149443 Merge "Camera2: Use Set for physical camera IDs" into pi-dev am: 83c4690f55 
am: f1b5a2a866

Change-Id: Ic6624159009c3dc5d312ab27be4aa9ec4e690686
 2018-03-20 03:43:47 +00:00
Kweku Adams
148d986e62 Merge "Removing the settings-based IncidentReportArgs method." into pi-dev 
am: 46c0e91b74

Change-Id: I19be9d6a6c3b1674dada4eaaf36faf2e555a8b79
 2018-03-20 02:20:03 +00:00
Adam Powell
01851d5060 Merge "Add factory methods for async Handlers" into pi-dev am: fa38f238b1 
am: d40f30610e

Change-Id: I49741a8142f377eefa0651d2ac5ea6292a240b49
 2018-03-20 01:44:44 +00:00
David Chen
27c3ab17f7 Merge "Small fixes to StatsManager API." into pi-dev am: 96e680cb90 
am: 1cc4099e80

Change-Id: Ib43baaa36d33fb8445ef694cfbfbff4b19543a6b
 2018-03-20 01:41:36 +00:00
Shuzhen Wang
f1b5a2a866 Merge "Camera2: Use Set for physical camera IDs" into pi-dev 
am: 83c4690f55

Change-Id: I11c86616264823d52e71e15db350ba6b588099b5
 2018-03-20 01:04:20 +00:00
Leon Scroggins
b2c060fc6a Merge "Merge "Add ImageDecoder.Source for resources" into pi-dev am: d65f5ed038" into pi-dev-plus-aosp 
am: 84474dbe76

Change-Id: If06c6c2e18a685e949c51a033200c9b044e4007c
 2018-03-19 23:37:35 +00:00
Adam Powell
d40f30610e Merge "Add factory methods for async Handlers" into pi-dev 
am: fa38f238b1

Change-Id: I0dee61e5dbd2a21bbd03c06cde72a66a708bc55f
 2018-03-19 23:21:29 +00:00
David Chen
1cc4099e80 Merge "Small fixes to StatsManager API." into pi-dev 
am: 96e680cb90

Change-Id: I2d7e2a204c91ed7a824002111452286e5efa4977
 2018-03-19 23:16:51 +00:00
sqian
4628a8cddd Merge "TelephonyManager System APIs process" into pi-dev 
am: f0aeb0578e

Change-Id: If80a92c24d11ab0b48dfdda32a9521f1f7ec4993
 2018-03-19 23:07:38 +00:00
Seigo Nonaka
8d2084e84c Merge "Revert "Make PrecomputedText Spannable for supporting selection"" into pi-dev am: b3aec698e8 
am: efd7a037d0

Change-Id: I4abfd9ade6928106f21a598dd33ab5be5e86d1b8
 2018-03-19 22:28:28 +00:00
TreeHugger Robot
46c0e91b74 Merge "Removing the settings-based IncidentReportArgs method." into pi-dev 2018-03-19 22:15:11 +00:00
TreeHugger Robot
83c4690f55 Merge "Camera2: Use Set for physical camera IDs" into pi-dev 2018-03-19 22:02:58 +00:00
Leon Scroggins
4e3ccb709f Merge "Add ImageDecoder.Source for resources" into pi-dev 
am: d65f5ed038

Change-Id: I4b69423bb54ca34161a7b4f98d1c87c427139660
 2018-03-19 21:39:49 +00:00
Adam Powell
fa38f238b1 Merge "Add factory methods for async Handlers" into pi-dev 2018-03-19 21:09:01 +00:00
TreeHugger Robot
96e680cb90 Merge "Small fixes to StatsManager API." into pi-dev 2018-03-19 21:04:39 +00:00
Seigo Nonaka
efd7a037d0 Merge "Revert "Make PrecomputedText Spannable for supporting selection"" into pi-dev 
am: b3aec698e8

Change-Id: I53dfdbfbd7d9a1278ae1e82e98f21cbddbc0cf55
 2018-03-19 20:57:27 +00:00
TreeHugger Robot
f0aeb0578e Merge "TelephonyManager System APIs process" into pi-dev 2018-03-19 20:55:18 +00:00
Tyler Gunn
a4ef504bdc Merge "Rename handover failure constant per API review comments." am: 7c8a877231 am: ffe1c22271 
am: e4330eaaf0

Change-Id: Ic0555b20dc508d022c0165a5d9dc3b40b33db70e
 2018-03-19 20:14:10 +00:00
Tyler Gunn
e4330eaaf0 Merge "Rename handover failure constant per API review comments." am: 7c8a877231 
am: ffe1c22271

Change-Id: Icae03afa86e7b660e9f52df252d2e3c961762be8
 2018-03-19 19:40:01 +00:00
Leon Scroggins
d65f5ed038 Merge "Add ImageDecoder.Source for resources" into pi-dev 2018-03-19 19:28:09 +00:00
TreeHugger Robot
b3aec698e8 Merge "Revert "Make PrecomputedText Spannable for supporting selection"" into pi-dev 2018-03-19 19:02:34 +00:00
sqian
2f39856753 TelephonyManager System APIs process 
- lock down some TelephonyManager APIs with system permission
- deprecate some TelephonyManager APIs due to its equivalents
- introduce an aidl interface that handles the current
getPhoneType() functions

The doc: https://docs.google.com/spreadsheets/d/1OJ6EXJ-Zys21mZ1BHgJeWkcfLq0pPxBR765r46ck80U/edit#gid=0

Bug: 62346128
Test: Compile
Change-Id: I5367372f3304e5ad368d0d4775f6e96168243aa3
Merged-In: I5367372f3304e5ad368d0d4775f6e96168243aa3
(cherry picked from commit 3b991aee47)
 2018-03-19 11:35:36 -07:00
Shuo Qian
2d907e45e3 Merge "TelephonyManager System APIs process" 2018-03-19 18:04:39 +00:00
Shuzhen Wang
bde1397db8 Camera2: Use Set for physical camera IDs 
Because physical camera IDs are not ordered, use Set instead.

Test: Camera CTS
Bug: 74838822
Change-Id: I2ca73ba42f4517283f4c0048f9369498b11eea66
 2018-03-19 10:51:45 -07:00
David Chen
c1a3a0d780 Small fixes to StatsManager API. 
Adds some annotations, deletes an unused API method, and adds some
comments.

Test: Flashed onto marlin-eng and verified there are no crashes.
Bug: 72562867
Change-Id: I6c93ee4aeeacf6842795256c76551cfb1c28888d
 2018-03-19 10:26:51 -07:00
Tyler Gunn
7c8a877231 Merge "Rename handover failure constant per API review comments." 2018-03-19 17:15:58 +00:00
Seigo Nonaka
e887f4d2c1 Revert "Make PrecomputedText Spannable for supporting selection" 
Crash on Sheets APp
This reverts commit 80ed5a35a9.

Bug: 75652829
Change-Id: I40ddd1b9754e74fbd90d7a029cce9c6a7ede0777
Test: Manual
 2018-03-19 17:04:30 +00:00
Leon Scroggins III
1eccac89c1 Add ImageDecoder.Source for resources 
Bug: 74545298
Test: Ibc283c2e8aee999e951de51f3a43b581a765aaf5

Although resources can already be accessed with ContentResolver + URI,
this allows a simple method to do the same.

Change-Id: I1bf698f36d5540f6de7cb9957e4223123d0f4331
 2018-03-19 13:01:52 -04:00
Adam Powell
8709ba863e Add factory methods for async Handlers 
Message.setAsynchronous is already public and this makes working
with posted messages that do not interact with UIs quite a bit nicer.

Added as factory methods for better integration with support shims
as well as generally encouraging the use of the handler callback
instead of subclassing for working with custom messages.

Bug: 73124158

Change-Id: I1210e7dc524fdf771e7af19297d5a822fdbd502c
 2018-03-19 15:54:13 +00:00
Julia Reynolds
50ef90645e Merge "Add new semantic Person fields" into pi-dev am: 6389e7bc44 
am: 1e856ca8c3

Change-Id: Ia4d842aa30e48f72e8b8a97e47fe57673a02212a
 2018-03-17 02:14:30 +00:00
Julia Reynolds
1e856ca8c3 Merge "Add new semantic Person fields" into pi-dev 
am: 6389e7bc44

Change-Id: I316ff063efbe3c36a34e3e9e00a463ae4364c4bd
 2018-03-17 01:50:45 +00:00
Julia Reynolds
6389e7bc44 Merge "Add new semantic Person fields" into pi-dev 2018-03-17 01:35:20 +00:00
Kweku Adams
015288241e Removing the settings-based IncidentReportArgs method. 
Bug: 72378645
Test: Flashed device
Change-Id: Ia12afffed169e1d0201e99887e74398de40c6cf6
 2018-03-16 18:15:46 -07:00
Amith Yamasani
ace2399673 Merge "App Time Limits API in UsageStats" into pi-dev am: a8bb9d255f 
am: 0071ccea48

Change-Id: I9be474caba095e377c40b9153d4adbc444380a05
 2018-03-16 23:19:57 +00:00
Amith Yamasani
0071ccea48 Merge "App Time Limits API in UsageStats" into pi-dev 
am: a8bb9d255f

Change-Id: I77b6656d38701b76444c64be1d75c7b86e70e3bb
 2018-03-16 23:08:42 +00:00
Aseem Kumar
183dcf30ba Merge "Unhide getKey() and importKey() and the whole class of RecoveryController. Added @RequiresPermission(android.permission.RECOVER_KEYSTORE) on all public APIs of RecoveryController." into pi-dev am: 3b0450d4a9 
am: 12c26fc509

Change-Id: I46b57bd17237f75323f56c1bd690132872bb75f4
 2018-03-16 23:05:10 +00:00
Aseem Kumar
12c26fc509 Merge "Unhide getKey() and importKey() and the whole class of RecoveryController. Added @RequiresPermission(android.permission.RECOVER_KEYSTORE) on all public APIs of RecoveryController." into pi-dev 
am: 3b0450d4a9

Change-Id: I650b80562b8e19d5264ec897f30145b5b393e77b
 2018-03-16 22:51:56 +00:00
TreeHugger Robot
a8bb9d255f Merge "App Time Limits API in UsageStats" into pi-dev 2018-03-16 22:40:46 +00:00
Aseem Kumar
3b0450d4a9 Merge "Unhide getKey() and importKey() and the whole class of RecoveryController. Added @RequiresPermission(android.permission.RECOVER_KEYSTORE) on all public APIs of RecoveryController." into pi-dev 2018-03-16 22:27:37 +00:00
Ruchi Kandoi
6fed97dc19 Merge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME" am: 01cef932c8 am: 7ad52283ab 
am: a3180099bf

Change-Id: I51953254afcaed92aa13293392efa6b628eaa8a2
 2018-03-16 22:07:09 +00:00
Jack Yu
5b7103ab97 Merge "Renamed getNetworkId and getSystemId" 2018-03-16 21:50:19 +00:00
Ruchi Kandoi
a3180099bf Merge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME" am: 01cef932c8 
am: 7ad52283ab

Change-Id: I4cdeed1b3b55de95e58c8784e379ccfe9da7e4d8
 2018-03-16 21:43:04 +00:00
sqian
3b991aee47 TelephonyManager System APIs process 
- lock down some TelephonyManager APIs with system permission
- deprecate some TelephonyManager APIs due to its equivalents
- introduce an aidl interface that handles the current
getPhoneType() functions

The doc: https://docs.google.com/spreadsheets/d/1OJ6EXJ-Zys21mZ1BHgJeWkcfLq0pPxBR765r46ck80U/edit#gid=0

Bug: 62346128
Test: Compile
Change-Id: I5367372f3304e5ad368d0d4775f6e96168243aa3
 2018-03-16 13:45:44 -07:00
Treehugger Robot
01cef932c8 Merge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME" 2018-03-16 20:12:04 +00:00
Aseem Kumar
c1742e5137 Unhide getKey() and importKey() and the whole class of RecoveryController. 
Added @RequiresPermission(android.permission.RECOVER_KEYSTORE) on all
public APIs of RecoveryController.

Bug: 73900159
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: I1047c038603869307d7a2462a2e5635fcd1c94c2
 2018-03-16 13:07:25 -07:00
Tyler Gunn
5c60d71efb Rename handover failure constant per API review comments. 
Expanding EMERG to EMERGENCY.

Test: Build code
Bug: 74831393
Change-Id: Ib7e6bea84e25b1e1a2ddb154c7ed62f1084a7596
 2018-03-16 12:38:43 -07:00
Julia Reynolds
18c35dfd61 Add new semantic Person fields 
Bug: 74431200
Test: cts
Change-Id: I9eda447ae371ef635e9044a13ba7973bd69520ce
 2018-03-16 19:13:51 +00:00
Jack Yu
3f5e5aef5c Merge "Renamed getNetworkId and getSystemId" into pi-dev am: 6b4e6a17e9 
am: a4bc10ab2c

Change-Id: I3464d53c8cd9cf3c90cb9bf49489d9cb93e7dc96
 2018-03-16 18:33:43 +00:00
Jack Yu
46d2bc06d6 Renamed getNetworkId and getSystemId 
1. Renamed getNetworkId() to getCdmaNetworkId()
2. Renamed getSystemId() to getCdmaSystemId()

Test: Build
Bug: 74976831
Merged-In: I2a5fb50a59c3239bd3dca5568991a9dff08839fc
Change-Id: I2a5fb50a59c3239bd3dca5568991a9dff08839fc
(cherry picked from commit 2661fac133)
 2018-03-16 11:07:37 -07:00