Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
235,871 Commits 3 Branches 0 Tags
0cf9637e50e275f514b8eae89ea53317e611aa53
Commit Graph

12661 Commits

Author SHA1 Message Date
Jaesung Chung
9d1cb06a5d Merge "ExifInterface: switch from using jhead to java implementation" into nyc-dev am: 9ad5278e2b 
am: 31b35a727c

* commit '31b35a727c0f8a04e5c95ca35b5c91fa257f50d0':
  ExifInterface: switch from using jhead to java implementation
 2016-02-25 07:08:33 +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
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
bbba6c2d3c Merge "Revert "Remove deprecated methods / classes"" into nyc-dev am: fe01ea05dd 
am: acbcf9d9ab

* commit 'acbcf9d9abfdecaf9c8038f810e12e183c59f422':
  Revert "Remove deprecated methods / classes"
 2016-02-24 23:04:53 +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
0e52890e2b Merge "Remove deprecated methods / classes" into nyc-dev am: ca67844e0c 
am: 07e794ad14

* commit '07e794ad14e0cfa433402a2fca4c14d26192facb':
  Remove deprecated methods / classes
 2016-02-24 21:22:45 +00:00
Todd Kennedy
ca67844e0c Merge "Remove deprecated methods / classes" into nyc-dev 2016-02-24 21:02:58 +00:00
Adam Powell
1275fcacf6 Merge "Un-hide string set persistence methods in Preference" into nyc-dev am: 475aa109dc 
am: 75549d01bf

* commit '75549d01bf0ca3e28fc1e8f2ef6b9d08e686048d':
  Un-hide string set persistence methods in Preference
 2016-02-24 19:34:53 +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
a1f36e58b6 Merge "DPM: installKeyPair variant: caller can self-grant" into nyc-dev am: 155a280e18 
am: 589e36e10a

* commit '589e36e10ad8406095a77a029b2871be63fd4c0c':
  DPM: installKeyPair variant: caller can self-grant
 2016-02-24 18:23:53 +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
75536db65a Merge "Enable to set canRecord and tunerCount statically" into nyc-dev am: ae262a8928 
am: 05e63a254d

* commit '05e63a254d126d9620a42354a96428d9458e33d3':
  Enable to set canRecord and tunerCount statically
 2016-02-24 18:08:21 +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
1c32cc59b2 Merge "Add subscription specific TelephonyManager calls." into nyc-dev am: 7aa999143f 
am: cc9231d32f

* commit 'cc9231d32f436d0d3765f24ee4069bbd682c5101':
  Add subscription specific TelephonyManager calls.
 2016-02-24 17:42:48 +00:00
Andres Morales
242a841964 Merge "Add SystemApi for retrieving device flash lock state" into nyc-dev am: f1af917c14 
am: a200a0ba56

* commit 'a200a0ba56e5aa096e254639944d3783ed0774a3':
  Add SystemApi for retrieving device flash lock state
 2016-02-24 17:37:43 +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
c2c8ac7c42 Merge "Add constant to link to app\'s general settings" into nyc-dev am: 6a723f73bd 
am: 5853d81a46

* commit '5853d81a46bda8276cc26985198aef4bdaed31dc':
  Add constant to link to app's general settings
 2016-02-24 16:32:14 +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
799a057a6b resolve merge conflicts of 51e4acb29d to nyc-dev am: 1142b2654a 
am: 86b5635540

* commit '86b5635540970fe49cb2e35926f229984221d0c2':
  Add Connectivity Metrics Logger service
 2016-02-24 06:44:31 +00: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
12aefc4104 Merge "TIF: Add COLUMN_SEASON_TITLE and COLUMN_(SEASON|EPISODE)_DISPLAY_NUMBER" into nyc-dev am: b4caa028c2 
am: 632dfe783b

* commit '632dfe783b97b18d4d012f331bc423ee360de840':
  TIF: Add COLUMN_SEASON_TITLE and COLUMN_(SEASON|EPISODE)_DISPLAY_NUMBER
 2016-02-24 02:26:56 +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
756984be18 Merge "TIF: Unhide URI util methods" into nyc-dev am: eefb17ac61 
am: 1300e14d79

* commit '1300e14d79d1a1fcc33426cb2e4629116c40f693':
  TIF: Unhide URI util methods
 2016-02-23 23:56:22 +00: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
f90abdebdb Merge "Offer to cache ringtones in system DE storage." into nyc-dev am: 1ce5c28ba5 
am: 2b2974dcef

* commit '2b2974dcef503da3b02c7bd67becad709ead7951':
  Offer to cache ringtones in system DE storage.
 2016-02-23 21:23:54 +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
928ce67ebf Merge "Revert "Revert "Add option to allow key validity after fingerprint enrollment.""" into nyc-dev am: 3f5fd1dbee 
am: c5cb5e1b61

* commit 'c5cb5e1b6196251f6684c9a8a2805f947dc10e57':
  Revert "Revert "Add option to allow key validity after fingerprint enrollment.""
 2016-02-23 20:45:56 +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
0b8b2bdf0c Merge "Fix NinePatchDrawable handling of density changes" into nyc-dev am: 5f8e0603e6 
am: 45753fef36

* commit '45753fef36b99863b6eba43915ca1fcb6d58a444':
  Fix NinePatchDrawable handling of density changes
 2016-02-23 20:10:06 +00: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
Jae Seo
9378b70f3a Merge "TIF: Hide android.permission.READ_TV_LISTINGS" into nyc-dev am: 47d1f420bb 
am: 873aa0bd13

* commit '873aa0bd139e40bb3e01366f4b42189d8c546472':
  TIF: Hide android.permission.READ_TV_LISTINGS
 2016-02-23 18:58:14 +00: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
b9afa687f0 Merge "New constant for BUS audio devices" into nyc-dev am: 7e2127a970 
am: 49271e3c5e

* commit '49271e3c5ef9908f6d6e8aa483fd26a5e2f0c2e4':
  New constant for BUS audio devices
 2016-02-23 18:10:17 +00:00
Philipp Weiß
5aaf46adc7 Merge "Remove deprecated APIs DPM.createUser, createAndInitializeUser" into nyc-dev am: f398479e06 
am: b737c71611

* commit 'b737c71611e21fdf591b1c0cbb8e32cc28cb8bea':
  Remove deprecated APIs DPM.createUser, createAndInitializeUser
 2016-02-23 18:06:24 +00:00
Jean-Michel Trivi
7e2127a970 Merge "New constant for BUS audio devices" into nyc-dev 2016-02-23 17:55:29 +00:00