Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
150,772 Commits 3 Branches 0 Tags
19caa123d623fdfd55cba0ae8a2bcb519ce9e7e6
Commit Graph

8512 Commits

Author SHA1 Message Date
Adam Lesinski
fe2ee96947 am d6ce3e36: am 345efd9a: am 58157586: Merge "Add FeatureGroup to PackageInfo" into lmp-dev 
* commit 'd6ce3e363ea229d4e00946492be2c9d60a2b049b':
  Add FeatureGroup to PackageInfo
 2014-08-16 00:44:55 +00:00
Jeff Sharkey
00eb0dc691 am 870e1f60: am 61c28588: am a1af0d42: Merge "PackageInstaller API refactoring." into lmp-dev 
* commit '870e1f6039b00a4878a01c59e8b407571f6361ba':
  PackageInstaller API refactoring.
 2014-08-16 00:44:50 +00:00
Julia Reynolds
34b5930fc3 resolved conflicts for merge of 9ef71fb5 to master 
Change-Id: I5b03835eddb1d0f5f3d93814732213458d5cd5d2
 2014-08-15 20:26:42 -04:00
Chet Haase
e4a7c1706d am d6f4feb0: am e7144508: am 6954e4f0: Merge "Minor doc fixes from API council recommendations." into lmp-dev 
* commit 'd6f4feb09fdfa33ace9373dd88e69ca9b7c5c05c':
  Minor doc fixes from API council recommendations.
 2014-08-15 21:11:35 +00:00
Julia Reynolds
d438deffad Merge "Apply lockdowns when user restrictions are set." into lmp-dev 2014-08-15 19:03:20 +00:00
Julia Reynolds
3d9eb78fe9 Apply lockdowns when user restrictions are set. 
Previously DMAgent would apply these lockdowns before/
after setting the matching user restrictions.

Bug: 16701642
Bug: 16945830
Bug: 16944983
Change-Id: Ib4f7145055687f12408d6ccacd8e6380406a32b2
 2014-08-15 16:16:38 -04:00
Adam Lesinski
91306bccf1 Merge "Add FeatureGroup to PackageInfo" into lmp-dev 2014-08-15 18:56:10 +00:00
Adam Lesinski
d3edfde51b Add FeatureGroup to PackageInfo 
FeatureGroups replace top-level FeatureInfo objects.
FeatureGroups inherit top-level FeatureInfos but override
them if the feature names are the same.

Bug:16822121

Change-Id: I80b2cb778a0fbcb4521efce986fba641e0914290
 2014-08-15 15:53:35 -07:00
Jeff Sharkey
3e3b251f46 Merge "PackageInstaller API refactoring." into lmp-dev 2014-08-15 18:56:10 +00:00
Jeff Sharkey
a0907436c0 PackageInstaller API refactoring. 
Switch to using IntentSender for results to give installers easier
lifecycle management.  Move param and info objects to inner classes.

Bug: 17008440
Change-Id: I944cfc580325ccc07acf22e0c681a5542d6abc43
 2014-08-15 15:57:02 -07:00
Jim Miller
78cbe091f1 am b15ca196: am 378f4bc4: am b69c0de3: Merge changes I77f49fe8,I305e927a into lmp-dev 
* commit 'b15ca196fb61b2eab7f85105cad1aeb7fd08e5d4':
  API review - move confirm credential constants from Intent
  Revert "Add new intent to prompt user for their device credential."
 2014-08-15 13:38:34 +00:00
Alan Viverette
bc774cdc15 am 54ab433c: am 54e70a6e: am f150fb34: Deprecate InputMethodService.enableHardwareAcceleration() 
* commit '54ab433c8beb43d87e12766685603e6c795df9f7':
  Deprecate InputMethodService.enableHardwareAcceleration()
 2014-08-15 11:43:48 +00:00
Chet Haase
a4888fbac9 Merge "Minor doc fixes from API council recommendations." into lmp-dev 2014-08-15 08:11:59 +00:00
Chet Haase
6beeb75723 Minor doc fixes from API council recommendations. 
Issue #17008236 API review: android.graphics

Change-Id: I171d376b642707858198d8a1379c732fcfcab4dd
 2014-08-15 11:14:48 -07:00
Jae Seo
8026650d17 am e83533ee: am cecfd8e4: am 5152ff49: Merge "TIF: Rename R.attr.contentRatingSystemXml and fix documentation" into lmp-dev 
* commit 'e83533ee160ebb079e4a92f2a59ca46a257ae412':
  TIF: Rename R.attr.contentRatingSystemXml and fix documentation
 2014-08-15 05:07:18 +00:00
RoboErik
0016b5f6a7 am 2dea60c8: am 1e553dc7: am b11490fb: Merge "Add an onSessionDestroyed callback to MediaController.Callback" into lmp-dev 
* commit '2dea60c8390ab4c2c12bc865819be983d5d6b3e0':
  Add an onSessionDestroyed callback to MediaController.Callback
 2014-08-15 05:06:50 +00:00
Doug Zongker
af8b11ae2a am 8c26c4c8: am a9c87471: am 2b13359a: Merge "@hide RECOVERY permission" into lmp-dev 
* commit '8c26c4c8f4784e3f8acce3a97f36e8c136d48349':
  @hide RECOVERY permission
 2014-08-14 23:43:12 +00:00
Alan Viverette
e07b595519 Deprecate InputMethodService.enableHardwareAcceleration() 
BUG: 16951553
Change-Id: I126ea823eb2eeabb29d30999dec9c9411b33b315
 2014-08-14 20:06:02 +00:00
Jose Lima
698dcf6b77 am 438d6300: am 06804518: am d361d4f9: Made AlarmClockInfo a nested class in AlarmManager 
* commit '438d630058336fb5afed72db34e75cf4898298a8':
  Made AlarmClockInfo a nested class in AlarmManager
 2014-08-14 17:56:59 +00:00
Jose Lima
9c9e325980 am ed60a1e1: am b991fd6e: am ec8834a3: Renamed "media playing" APIs to "visible behind" 
* commit 'ed60a1e131918adba2777a577ebabd9866728d57':
  Renamed "media playing" APIs to "visible behind"
 2014-08-14 17:56:47 +00:00
RoboErik
b05ea7bb28 Merge "Add an onSessionDestroyed callback to MediaController.Callback" into lmp-dev 2014-08-14 16:10:21 +00:00
Jose Lima
235510e672 Made AlarmClockInfo a nested class in AlarmManager 
Bug: 16959028
Change-Id: I150eaaff765d1e214c3621c1bf50162ec0dac8ec
 2014-08-14 02:10:41 +00:00
Jose Lima
4b6c6697da Renamed "media playing" APIs to "visible behind" 
- Request from API Review: rename the media playing APIs to a more
     generic name, reflecting the background visibility feature these
     methods actually control.
   - Made the new isActivityVisibleBehind().
   - Changed convertFromTranslucent() and convertToTranslucent() to be
     SystemApi.

Bug: 16959028
Change-Id: I526eac22f44273b3254dd6201f89194d13e597e2
 2014-08-14 02:00:04 +00:00
RoboErik
24762bffc3 Add an onSessionDestroyed callback to MediaController.Callback 
Callbacks on the controller need to know when the session ceases
to exist.

bug:17009030
Change-Id: I0f1c1cfc51f7dd2203955287cc269667d3765ee4
 2014-08-13 15:00:21 -07:00
keunyoung
28ba176957 am 14a3d969: am a90c8cba: am 64c0b0b6: Merge "rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP" into lmp-dev 
* commit '14a3d9696ae79fa774b9787fd4e658b1018886f0':
  rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP
 2014-08-13 20:06:00 +00:00
Ihab Awad
d27d0bd43a am 1f6d358a: am 162c1c06: am 5ba3f456: Merge "Final structural tweaks to Telecomm API (1/8)" into lmp-dev 
* commit '1f6d358a4e54e41ddaea59711fb9f1ebfa5be0ca':
  Final structural tweaks to Telecomm API (1/8)
 2014-08-13 19:14:10 +00:00
ztenghui
91390fc899 am 4beef40b: am 7fec32e6: am cd65c61f: Revert "Revert "Update attrs / public.xml for VectorDrawable opacity removal"" 
* commit '4beef40b0c81f78f0ad2da2c868aecdb7432dfab':
  Revert "Revert "Update attrs / public.xml for VectorDrawable opacity removal""
 2014-08-13 17:54:59 +00:00
ztenghui
eceec05d4c Revert "Revert "Update attrs / public.xml for VectorDrawable opacity removal"" 
This reverts commit d0a9544a772c906ed68793209d1e4a809174cca2.
 2014-08-13 17:25:15 +00:00
Jean-Michel Trivi
684ac24bd9 am 4998fa89: am 94dc549b: am f181197f: Merge "Add support for AudioAttributes in android.media.Ringtone" into lmp-dev 
* commit '4998fa89e9978c7d84614f70c0cd56420538c13d':
  Add support for AudioAttributes in android.media.Ringtone
 2014-08-13 16:11:29 +00:00
Dianne Hackborn
0216f0dbee am c0c41df5: am 905f8e8b: am 50d61878: Merge "Add 560dpi, and some other stuff." into lmp-dev 
* commit 'c0c41df5452175e1441837aeed2d0bdabaed6e59':
  Add 560dpi, and some other stuff.
 2014-08-13 05:20:20 +00:00
Jae Seo
fc27d6db08 TIF: Rename R.attr.contentRatingSystemXml and fix documentation 
- Rename contentRatingSystemXml to tvContentRatingDescription.
- Change docs to indicate this is a reference to an XML document that
  describes TV content rating, not a component name.
- Replace the DTD with an XML example.

Bug: 16960702
Change-Id: Iea985e9847ee5af0f745e896c498792234308b12
 2014-08-14 17:28:07 +00:00
Alan Viverette
4466a68ed0 am 8a3b0af1: am ae1970d9: am 48286f82: Merge "Add API for obtaining max text length for accessibility" into lmp-dev 
* commit '8a3b0af14cf9f6b844f4cd78bd69677e10aa99d1':
  Add API for obtaining max text length for accessibility
 2014-08-13 00:43:53 +00:00
Tenghui Zhu
1faed98027 am 62a7114f: am 5b6ddc78: am d0a9544a: Revert "Update attrs / public.xml for VectorDrawable opacity removal" 
* commit '62a7114f673dc75ecd35383e84204ff2a3ec630f':
  Revert "Update attrs / public.xml for VectorDrawable opacity removal"
 2014-08-13 00:09:46 +00:00
Tenghui Zhu
3caecc6ea2 Revert "Update attrs / public.xml for VectorDrawable opacity removal" 
This reverts commit 9c44a95d5168c219facb39e7cca275d1e0a02cee.

Change-Id: If328d3101ce44c63d643217218109bb82e4f20ae
 2014-08-12 16:48:46 -07:00
Jim Miller
66093a9024 API review - move confirm credential constants from Intent 
Moves constants from Intent to KeyguardManager.

Fixes bug 17006280

Change-Id: I77f49fe85850a501e1531d39aad7446c9bca5801
 2014-08-15 00:38:21 +00:00
Jim Miller
4d64746d6a Revert "Add new intent to prompt user for their device credential." 
Move API to KeyguardManager.

Fixes bug 17006280

This reverts commit 2e7beadedeb7d41d8c2d1cc62956bdd9f5081d26.

Change-Id: I7b58bb4d9db828028c1021f17b01745c5ec2161e

Conflicts:
	core/java/android/content/Intent.java
 2014-08-15 00:35:50 +00:00
Doug Zongker
f0433e50c7 Merge "@hide RECOVERY permission" into lmp-dev 2014-08-12 23:14:35 +00:00
keunyoung
c093bf2645 rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP 
bug: 16959030
Change-Id: I413a2ba676488bfc18e393465b98681682ec88d4
 2014-08-13 18:58:03 +00:00
Ihab Awad
b19a0bcdd8 Final structural tweaks to Telecomm API (1/8) 
Bug: 16416927
Bug: 16494880
Change-Id: I45fbe287c410cbb5e1b985f320b862d732811f43
 2014-08-13 11:16:46 -07:00
Jean-Michel Trivi
ceb4d41846 Merge "Add support for AudioAttributes in android.media.Ringtone" into lmp-dev 2014-08-12 23:14:35 +00:00
Dianne Hackborn
deb434ca08 Merge "Add 560dpi, and some other stuff." into lmp-dev 2014-08-12 23:14:35 +00:00
Alan Viverette
f2546bf423 Merge "Add API for obtaining max text length for accessibility" into lmp-dev 2014-08-12 23:14:35 +00:00
Jean-Michel Trivi
81f871e2b9 Add support for AudioAttributes in android.media.Ringtone 
Deprecate use of stream types.
Map deprecated API to AudioAttributes.
Add new methods to specify AudioAttributes on a Ringtone instance.

Bug 16790748

Change-Id: Ifb3c2e838e1f119614459ad7d71d83a4d7c9ffdb
 2014-08-12 15:53:15 -07:00
Dianne Hackborn
a3fb40d5f4 Add 560dpi, and some other stuff. 
Like new settings actions for some of the new settings panels.
And fix voice interaction services so they require a recognizer.
And tweak array map doc to be correct.

Blah blah blah.

Change-Id: Ib5e66b574b10e7b3fa39723b21046a74e6ead204
 2014-08-12 15:38:19 -07:00
Alan Viverette
029942f77d Add API for obtaining max text length for accessibility 
BUG: 16736956
Change-Id: I15ffb9bf68e074adf3e0dbcd230367e115c03e3c
 2014-08-12 14:55:56 -07:00
Doug Zongker
183415e521 @hide RECOVERY permission 
Bug: 16959027
Change-Id: I99fbdf24d5e8bce4beb32fa872e0caa6bfdbe1e9
 2014-08-12 10:20:00 -07:00
Jean-Michel Trivi
cb02627f24 am 38c611a6: am 47aea2a3: am 6fdf173c: Merge "HDMI plug intent and associated information" into lmp-dev 
* commit '38c611a6da750b1ba834199c0ade96b527e830fc':
  HDMI plug intent and associated information
 2014-08-12 18:05:44 +00:00
Jean-Michel Trivi
37d7804627 HDMI plug intent and associated information 
Read HDMI device information from audio ports and add it as
 extras in the connection intent.
Document the new extras in the connection intent.
Make Intent.ACTION_HDMI_AUDIO_PLUG public.

Bug 10549017

Change-Id: I6236b5363f00c433e443195fae8c43af2fc834f7
 2014-08-12 17:16:30 +00:00
Robin Lee
3c7bb1f9c5 am 2f5c37d1: am a4ca4bc5: am 40bdb1f7: Clean up DevicePolicyManager CA certificate APIs 
* commit '2f5c37d122b6ddbb7e78773138ffe7e9c7ee5bf1':
  Clean up DevicePolicyManager CA certificate APIs
 2014-08-12 16:13:05 +00:00
Robin Lee
7e67871174 Clean up DevicePolicyManager CA certificate APIs 
For consistency all CA-related methods now require the ComponentName
of a DeviceAdminReceiver as the first parameter. Updated javadoc for
this and added in some more detail about the methods in general as
well.

Created two new utility APIs,one to list all installed CAs and one to
remove all installed (user) CAs. Deleted old hasAnyCaCertsInstalled
method because it is now redundant.

@bug 16488006

Change-Id: I55eec17e01489ab323f8a0e68b11592605a7b740
 2014-08-12 16:54:40 +01:00