Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
234,904 Commits 3 Branches 0 Tags
bce4fe1bdd2e6247bc8355041f5f63de4b4ff708
Commit Graph

12565 Commits

Author SHA1 Message Date
Pablo Ceballos
0f61ae26ce Merge "Add glReadPixels with buffer-offset argument" into nyc-dev 2016-02-25 18:54:18 +00:00
Shishir Agrawal
70d5c8d246 Merge "Multi-SIM - Fixing inconsistent naming in CarrierConfigManager." into nyc-dev 2016-02-25 18:49:48 +00:00
Jae Seo
12eb094232 Merge "TIF: Define activity action to set up channel sources" into nyc-dev 2016-02-25 18:37:34 +00:00
Shishir Agrawal
3bf26b5605 Multi-SIM - Fixing inconsistent naming in CarrierConfigManager. 
All MSIM specific calls should not use a suffix/prefix.

Bug: 26772894
Change-Id: I49488dfc41bb7996a1a44447968ec11132e4dac7
 2016-02-25 10:15:54 -08:00
Santos Cordon
256aa5afd7 Merge "Add APIs to support CDMA add-call limitations." into nyc-dev 2016-02-25 16:16:43 +00:00
Jaesung Chung
596e1d3b7a Merge "Revert "Revert "ExifInterface: switch from using jhead to java implementation""" into nyc-dev 2016-02-25 14:14:28 +00:00
Jaesung Chung
15ef59e081 Revert "Revert "ExifInterface: switch from using jhead to java implementation"" 
This reverts commit 3c233ee291.

Bug: 27349581
Change-Id: Ib9f687e79ec36692fa7505ba3852099eb3e44573
 2016-02-25 14:13:10 +00:00
Sungsoo Lim
b21622d477 Merge "Revert "ExifInterface: switch from using jhead to java implementation"" into nyc-dev 2016-02-25 11:50:43 +00:00
Sungsoo Lim
3c233ee291 Revert "ExifInterface: switch from using jhead to java implementation" 
This reverts commit bf24c9fcb3.

Change-Id: Id278e831a9c03f615208fd6eab51c65f7bb019eb
 2016-02-25 11:48:10 +00:00
Jaesung Chung
9ad5278e2b Merge "ExifInterface: switch from using jhead to java implementation" into nyc-dev 2016-02-25 05:35:54 +00:00
Jae Seo
a6d34ee8b4 TIF: Define activity action to set up channel sources 
Bug: 24776978
Change-Id: Ib176217bb896fa10db73c5aa8568171b9f6e2fe7
 2016-02-24 18:44:21 -08:00
Jaesung Chung
bf24c9fcb3 ExifInterface: switch from using jhead to java implementation 
Bug: 26044456, Bug: 11224701
Change-Id: I881ef0ead24bcec76c0fa5a7dd0b74cc71c77285
 2016-02-25 10:57:27 +09:00
Edward Cunningham
648b952956 Merge "Revert "DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details."" into nyc-dev 2016-02-25 01:10:57 +00:00
Todd Kennedy
fe01ea05dd Merge "Revert "Remove deprecated methods / classes"" into nyc-dev 2016-02-24 22:45:50 +00:00
Todd Kennedy
5cbeb59026 Revert "Remove deprecated methods / classes" 
This reverts commit 9706c01f9b.

Change-Id: I14c53ab140220e48f6728b1173ea58760bbeb7f9
 2016-02-24 22:45:00 +00:00
Edward Cunningham
c6f5738d3c Revert "DO NOT MERGE Extend the DownloadManager.addCompletedDownload() method to support origin details." 
This reverts commit baccf15a4a.

Change-Id: If218d579cbf473fdab2b16a715a5dbb75dc9fbbc
 2016-02-24 22:43:15 +00:00
Todd Kennedy
ca67844e0c Merge "Remove deprecated methods / classes" into nyc-dev 2016-02-24 21:02:58 +00:00
Adam Powell
475aa109dc Merge "Un-hide string set persistence methods in Preference" into nyc-dev 2016-02-24 19:13:55 +00:00
Robin Lee
155a280e18 Merge "DPM: installKeyPair variant: caller can self-grant" into nyc-dev 2016-02-24 18:14:36 +00:00
Jae Seo
ae262a8928 Merge "Enable to set canRecord and tunerCount statically" into nyc-dev 2016-02-24 17:53:48 +00:00
Shishir Agrawal
7aa999143f Merge "Add subscription specific TelephonyManager calls." into nyc-dev 2016-02-24 17:35:47 +00:00
Andres Morales
f1af917c14 Merge "Add SystemApi for retrieving device flash lock state" into nyc-dev 2016-02-24 17:30:26 +00:00
Robin Lee
ce3399fbb4 DPM: installKeyPair variant: caller can self-grant 
If 'requestAccess' is true, the caller (either profile/device owner or a
designated certificate installer) will be granted usage of the keypair
on successful installation.

This has no security implications for a profile/device owner which would
already be able to self-grant. Delegated certificate installers did not
have this ability before.

This is only allowed at install-time- not afterward.

Bug: 24746231
Change-Id: Ia0ec290bb0bcde1d8137c188e2667cb7718dbfd7
 2016-02-24 17:14:41 +00:00
Jason Monk
2f68e8a62a Add constant to link to app's general settings 
Bug: 27276982
Change-Id: Ia438faeb12b24251bb74919f680713a7bc03e0b5
 2016-02-24 10:25:42 -05:00
Lorenzo Colitti
1142b2654a resolve merge conflicts of 51e4acb29d to nyc-dev 
Also add the appropriate changes to api/test-current.txt, which
is not present on mm-wireless-dev from which this change came.

Change-Id: Ic4df6d0f89add73b7e5252ef662de07a4e8fce31
 2016-02-24 15:19:15 +09:00
Pierre Imai
51e4acb29d Merge "Add Connectivity Metrics Logger service" into mm-wireless-dev 2016-02-24 04:49:24 +00:00
Dongwon Kang
b4caa028c2 Merge "TIF: Add COLUMN_SEASON_TITLE and COLUMN_(SEASON|EPISODE)_DISPLAY_NUMBER" into nyc-dev 2016-02-24 02:09:03 +00:00
Dongwon Kang
a60bc111e5 TIF: Add COLUMN_SEASON_TITLE and COLUMN_(SEASON|EPISODE)_DISPLAY_NUMBER 
Bug: 21778419
Change-Id: I1684e2f1c274306706736061e3f41c9840e563c4
 2016-02-23 18:03:55 -08:00
Shishir Agrawal
5210393891 Add subscription specific TelephonyManager calls. 
SubId specific version of the following functions are being added.
  - hasCarrierPrivileges
  - iccCloseLogicalChannel
  - iccExchangeSimIO
  - iccOpenLogicalChannel
  - iccTransmitApduBasicChannel
  - iccTransmitApduLogicalChannel
  - sendEnvelopeWithStatus
  - setOperatorBrandOverride
  - setPreferredNetworkTypeToGlobal

Bug: 26772894

Change-Id: I8c9e6d9bfe73f530e6f91c86211103fdfb1520bf
 2016-02-23 17:06:09 -08:00
Jae Seo
dee3cfe897 Enable to set canRecord and tunerCount statically 
Bug: 27276122
Change-Id: I61d07cfdbe13e4484ccaf5cdcf0796f08c78e2a8
 2016-02-23 16:52:16 -08:00
Adam Powell
5c2f839971 Un-hide string set persistence methods in Preference 
6 years is enough time for API approval.

Bug 27324328

Change-Id: I5d5af0fc291250cd9ea5b50cd5031378475eacec
 2016-02-23 16:28:07 -08:00
Jae Seo
eefb17ac61 Merge "TIF: Unhide URI util methods" into nyc-dev 2016-02-23 23:39:10 +00:00
Jae Seo
87079f1fd8 TIF: Unhide URI util methods 
Bug: 27314735
Change-Id: Ib2aeb451a435bb959efb1cba359c335b051f88e5
 2016-02-23 15:22:33 -08:00
Shishir Agrawal
29c490bcd3 Merge "DO NOT MERGE: Add subscription specific TelephonyManager calls." into mm-wireless-dev 2016-02-23 22:59:23 +00:00
Jeff Sharkey
1ce5c28ba5 Merge "Offer to cache ringtones in system DE storage." into nyc-dev 2016-02-23 20:57:46 +00:00
Shawn Willden
3f5fd1dbee Merge "Revert "Revert "Add option to allow key validity after fingerprint enrollment.""" into nyc-dev 2016-02-23 20:33:11 +00:00
Jeff Sharkey
413573ac59 Offer to cache ringtones in system DE storage. 
Ringtones often live on shared media, which is now encrypted with CE
keys and not available until after the user is unlocked.  To improve
the user experience while locked, cache the default ringtone,
notification sound, and alarm sound in a DE storage area.

Bug: 26730753
Change-Id: Ie6ad7790af4c87dd25759df3ed017e3b91a2fb87
 2016-02-23 13:27:00 -07:00
Alan Viverette
5f8e0603e6 Merge "Fix NinePatchDrawable handling of density changes" into nyc-dev 2016-02-23 19:56:24 +00:00
Alan Viverette
921ec44647 Fix NinePatchDrawable handling of density changes 
Scaling is now manually applied when the canvas density is not set.

Removes set/getNinePatch accessors that were added in N, since these
are not used and setting the nine patch directly will break padding.
Also removes local NinePatch, which was not necessary.

Bug: 27038114
Change-Id: Ie8b2e485b54d1ed1521081b329a09915fd0a95c1
 2016-02-23 14:54:01 -05:00
Andres Morales
74e9b18b2d Add SystemApi for retrieving device flash lock state 
Bug: 26039090
Change-Id: Ib51c4862d897cc91a0788379c761ed49a2adf271
 2016-02-23 10:53:49 -08:00
Jae Seo
47d1f420bb Merge "TIF: Hide android.permission.READ_TV_LISTINGS" into nyc-dev 2016-02-23 18:37:41 +00:00
Jean-Michel Trivi
7e2127a970 Merge "New constant for BUS audio devices" into nyc-dev 2016-02-23 17:55:29 +00:00
Philipp Weiß
f398479e06 Merge "Remove deprecated APIs DPM.createUser, createAndInitializeUser" into nyc-dev 2016-02-23 17:53:58 +00:00
Jean-Michel Trivi
a572e4a87b Merge "Make android.media.AudioFormat parcelable" into nyc-dev 2016-02-23 16:54:12 +00:00
Jesse Hall
791a7df8b2 Merge "PackageManager: add Vulkan system features" into nyc-dev 2016-02-23 15:11:52 +00:00
Benjamin Franz
72283fdb61 Merge "Make user provisioning state SystemApi" into nyc-dev 2016-02-23 13:51:08 +00:00
Benjamin Franz
eed2a8e165 Make user provisioning state SystemApi 
These APIs are used by the SUW. To go with the convention that all SUW
APIs should be SystemApi, adding it to these ones.

Bug: 25858670
Change-Id: Icffc9cdc13fa87da3543d92308f87dd0c9764c81
 2016-02-23 13:02:57 +00:00
Toby Sargeant
cf7518f78a Merge "add @SystemApi to WEBVIEW_MULTIPROCESS to enable it to be used in WebView glue" into nyc-dev 2016-02-23 10:35:09 +00:00
Pavel Zhamaitsiak
02b3e6bfc5 Add Connectivity Metrics Logger service 
This service can be used to pass events to metrics collection service

Change-Id: I213874300693cd121f2c8676f70893315de4c4c0
 2016-02-23 17:32:53 +09:00
Jae Seo
b1f7fab4e4 TIF: Hide android.permission.READ_TV_LISTINGS 
Bug: 21959866
Change-Id: Ie0e36749b8fe86faebadfaab4ebe5847fac3c343
 2016-02-22 21:35:32 -08:00