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

39749 Commits

Author SHA1 Message Date
Glenn Kasten
45b851559c am a180cd0c: am 95ff26f9: am 1666a7c5: Merge "Move setting to disable automatic USB routing" into lmp-dev 
* commit 'a180cd0c87916551d01ae60d88bad68f68c19002':
  Move setting to disable automatic USB routing
 2014-08-14 05:20:09 +00:00
Glenn Kasten
032ec5a0f0 am 95ff26f9: am 1666a7c5: Merge "Move setting to disable automatic USB routing" into lmp-dev 
* commit '95ff26f927a8fc0179a5f3a5012090b1568b58c6':
  Move setting to disable automatic USB routing
 2014-08-14 04:20:14 +00:00
Yorke Lee
5963c95a0e am 548c4642: am 31183c57: am 571d2642: Disable call log for users with DISALLOW_OUTGOING_CALLS restriction 
* commit '548c4642fbb55dcbbfb5f08da388b4e978307c36':
  Disable call log for users with DISALLOW_OUTGOING_CALLS restriction
 2014-08-13 21:39:57 +00:00
Yorke Lee
2a96238c72 am 31183c57: am 571d2642: Disable call log for users with DISALLOW_OUTGOING_CALLS restriction 
* commit '31183c57c7f0f568d7902479fe862370b57af3fa':
  Disable call log for users with DISALLOW_OUTGOING_CALLS restriction
 2014-08-13 21:35:35 +00:00
Yorke Lee
15f83c6f64 Disable call log for users with DISALLOW_OUTGOING_CALLS restriction 
Bug: 16217514
Change-Id: Iacd5699d0a540ca0e5a678662379bf8c611f7462
 2014-08-13 21:17:53 +00:00
Amith Yamasani
e8d12b6440 am b2c95e74: am 6648994f: am 5884bca0: Decouple user limit from guest creation 
* commit 'b2c95e74187539d78a9df70ae3361a67b5e72de9':
  Decouple user limit from guest creation
 2014-08-13 20:25:40 +00:00
Jeff Sharkey
99974c3921 am 21500a27: am c9c98188: am 9096e1b2: Merge "Fix javadoc attr reference." into lmp-dev 
* commit '21500a277e7b14531a63394f482c9054ec8aa610':
  Fix javadoc attr reference.
 2014-08-13 20:25:36 +00:00
Amith Yamasani
b0dd621ef3 am 6648994f: am 5884bca0: Decouple user limit from guest creation 
* commit '6648994f02769f957a197deef011291d11a390b8':
  Decouple user limit from guest creation
 2014-08-13 20:18:50 +00:00
Jeff Sharkey
d468092c24 am c9c98188: am 9096e1b2: Merge "Fix javadoc attr reference." into lmp-dev 
* commit 'c9c9818872697b17e84fa329603264bcd6210e73':
  Fix javadoc attr reference.
 2014-08-13 20:18:45 +00:00
Amith Yamasani
95ab784944 Decouple user limit from guest creation 
Allow Guest to be created even if there are N users.
Allow N users to be created even if there are N-1 users
   and a Guest.
Limit number of guests and managed profiles that can
be added.

Added unit tests.

Bug: 15934700
Change-Id: I1a8f0fa38a91d71ef7b2980e05c974244dfc337a
 2014-08-13 20:09:20 +00: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
Andres Morales
2b2850baa7 am f1270c94: am aabd0ad4: am 98b4b65c: Mark PDBManager as a SystemApi 
* commit 'f1270c940af4d8e80ebf8607e330d922c9f4b22c':
  Mark PDBManager as a SystemApi
 2014-08-13 20:05:53 +00:00
keunyoung
fa4c60cf63 am a90c8cba: am 64c0b0b6: Merge "rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP" into lmp-dev 
* commit 'a90c8cba81ab4721e4d440d4ddd0a9710bf62def':
  rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP
 2014-08-13 20:00:50 +00:00
Andres Morales
3e7951c9f1 am aabd0ad4: am 98b4b65c: Mark PDBManager as a SystemApi 
* commit 'aabd0ad4149928935af1c2a3d4e331a6cdfe7d96':
  Mark PDBManager as a SystemApi
 2014-08-13 20:00:45 +00:00
Andres Morales
396181b0cb Mark PDBManager as a SystemApi 
This will allow us to XTS test these APIs

Change-Id: Ife942f73580ea24eb6801b079b642d7c67107ab0
 2014-08-13 19:48:08 +00:00
Dianne Hackborn
35dcdf435e am 86b80753: am 5c95bce5: am 604f5487: Merge "Fix some IntentFilter docs." into lmp-dev 
* commit '86b8075331b013e8d502af451edc9a28934e3c35':
  Fix some IntentFilter docs.
 2014-08-13 18:01:16 +00:00
Dianne Hackborn
453c1ba472 am 5c95bce5: am 604f5487: Merge "Fix some IntentFilter docs." into lmp-dev 
* commit '5c95bce5aa5dd15d933e1daa954864337d5e1f4b':
  Fix some IntentFilter docs.
 2014-08-13 17:56:05 +00:00
Torne (Richard Coles)
a6931b63e7 am d23c756d: am 31a91904: am eafbb2f8: Merge "Add trace events to WebView startup." into lmp-dev 
* commit 'd23c756d4a067833a93b27204e638f02c5bce9d4':
  Add trace events to WebView startup.
 2014-08-13 16:44:41 +00:00
Torne (Richard Coles)
17c1e3dd3f am 31a91904: am eafbb2f8: Merge "Add trace events to WebView startup." into lmp-dev 
* commit '31a91904feab4701666d59285f23cd280cb4c50d':
  Add trace events to WebView startup.
 2014-08-13 16:39:07 +00:00
Robert Ly
42b94bbdd1 am 4fd774a0: am 5651dab7: am 683306d4: am 84f00277: am 9ada140f: am efbbb182: Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs 
* commit '4fd774a089ff7023b92cb677ce77a58f77a0cc06':
  cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5
 2014-08-13 16:31:03 +00:00
Robert Ly
946e6882dd am 5651dab7: am 683306d4: am 84f00277: am 9ada140f: am efbbb182: Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs 
* commit '5651dab74639906cb8782bfaf6450ebfbe5ec7e4':
  cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5
 2014-08-13 16:26:49 +00:00
Robert Ly
b369ff7b38 am 84f00277: am 9ada140f: am efbbb182: Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs 
* commit '84f00277b11a0324f0dd08054b119f2a61f1e646':
  cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5
 2014-08-13 16:17:49 +00:00
Robert Ly
84f00277b1 am 9ada140f: am efbbb182: Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs 
* commit '9ada140fc1a8cb6dabc0b0951249cb7a46578c37':
  cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5
 2014-08-13 16:12:37 +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
Robert Ly
9ada140fc1 am efbbb182: Merge "cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5" into klp-modular-docs 
* commit 'efbbb18241c8b74a2813b48af2aeff8f03fbe8e7':
  cherrypick from klp-docs docs: security consideration for Android <4.2 Change-Id: I5fe51641539f7ffe7abcdb0618371dd3f4b62ab5
 2014-08-13 16:07:40 +00:00
Jean-Michel Trivi
114e293143 am 94dc549b: am f181197f: Merge "Add support for AudioAttributes in android.media.Ringtone" into lmp-dev 
* commit '94dc549b6fe45fd4bde0bedf035fb34eb4b797b8':
  Add support for AudioAttributes in android.media.Ringtone
 2014-08-13 16:07:32 +00:00
Jorim Jaggi
dacc8b1e13 am b12665a1: am 119b3c40: am 36abea42: Merge "Lockscreen launch animations" into lmp-dev 
* commit 'b12665a10286ef1d552e7881cd2f6320203927a6':
  Lockscreen launch animations
 2014-08-13 14:18:07 +00:00
Jorim Jaggi
728f39f578 am 119b3c40: am 36abea42: Merge "Lockscreen launch animations" into lmp-dev 
* commit '119b3c40078d532dce4b1de56f4645b6ea587874':
  Lockscreen launch animations
 2014-08-13 14:13:41 +00:00
Lorenzo Colitti
95541d07ef am 9d50d603: am ac292abc: am 22ecb7de: Switch RouteInfo to use IpPrefix instead of LinkAddress. 
* commit '9d50d603820002532c2f7ca35e239087a1fd6ccc':
  Switch RouteInfo to use IpPrefix instead of LinkAddress.
 2014-08-13 13:16:36 +00:00
Lorenzo Colitti
0da5e91b90 am ac292abc: am 22ecb7de: Switch RouteInfo to use IpPrefix instead of LinkAddress. 
* commit 'ac292abc8f367da4f0098873dfbf58c6f04cb03f':
  Switch RouteInfo to use IpPrefix instead of LinkAddress.
 2014-08-13 13:12:08 +00:00
Lorenzo Colitti
1806b1fc25 Switch RouteInfo to use IpPrefix instead of LinkAddress. 
This addresses a TODO and also makes it possible to create
routes to destinations that are not valid LinkAddresses, such as
multicast addresses.

Bug: 16875580
Change-Id: Id4c77b00dc3064bf27d78cdcbbe035e645748cfe
 2014-08-13 21:17:20 +09:00
Narayan Kamath
4dfae0ff15 am 4f336f4a: am 8a4c1f74: am a76f47ee: Persist the cpuAbiOverride setting. 
* commit '4f336f4aa318b9cf26cbd4983324b9404cad4c91':
  Persist the cpuAbiOverride setting.
 2014-08-13 11:56:56 +00:00
Narayan Kamath
1c002e9f50 am 8a4c1f74: am a76f47ee: Persist the cpuAbiOverride setting. 
* commit '8a4c1f74b4032613807bf4589430acdfc0f2e535':
  Persist the cpuAbiOverride setting.
 2014-08-13 11:52:54 +00:00
Narayan Kamath
4903f64ba2 Persist the cpuAbiOverride setting. 
If an app is installed with an ABI override (adb install -r --abi)
we should remember this so that we don't revert to the scan derived
ABI on the next reboot.

bug: 16476618

Change-Id: I6085bc0099eb613dd9d3b07113c7c13859780697
 2014-08-13 12:41:19 +01:00
Yohei Yukawa
530102a7ff am 3dcebe5d: am c1d16578: am 692b78be: Suppress warnings of redundant calls of #updateCursorAnchorInfo 
* commit '3dcebe5d3f6291486431b520d7f9b9c5f3868c3e':
  Suppress warnings of redundant calls of #updateCursorAnchorInfo
 2014-08-13 09:16:44 +00:00
Yohei Yukawa
e69662a125 am c1d16578: am 692b78be: Suppress warnings of redundant calls of #updateCursorAnchorInfo 
* commit 'c1d16578b78374890b177a0e92d6495d4ee12dbb':
  Suppress warnings of redundant calls of #updateCursorAnchorInfo
 2014-08-13 09:09:42 +00:00
Yohei Yukawa
7360591bbf Suppress warnings of redundant calls of #updateCursorAnchorInfo 
Warnings of redundant calls of #updateCursorAnchorInfo should be
suppressed at least until such redundant calls from
android.widget.Editor are addressed.

BUG: 16996008
Change-Id: I62b6acdab06178520473bd53e56e2cfb62fb17be
 2014-08-13 17:17:09 +09:00
Dianne Hackborn
4cb83c5ac3 am 87e9aa31: am 8aff6aaa: am 240384e9: Merge "Turn off voice interaction service restrction for now" into lmp-dev 
* commit '87e9aa31a1f9afffcedd7631b56b77a791e4e2da':
  Turn off voice interaction service restrction for now
 2014-08-13 06:18:53 +00:00
Dianne Hackborn
60f819c355 am 8aff6aaa: am 240384e9: Merge "Turn off voice interaction service restrction for now" into lmp-dev 
* commit '8aff6aaa510dab196bd8fe37b9b58ea4b173f819':
  Turn off voice interaction service restrction for now
 2014-08-13 06:14:55 +00:00
Svet Ganov
0f1ff7fd9f am 31c8f8a8: am d06d9738: am 936a5219: Check accessibility cache integrity only on eng builds. 
* commit '31c8f8a85f14a4b37026c168606682a020ec8490':
  Check accessibility cache integrity only on eng builds.
 2014-08-13 05:29:00 +00:00
Dan Sandler
1831c4df42 am 97a000f2: am 6eb58ce4: am 0f875bac: Large text support for notifications. 
* commit '97a000f27d71541df28b8a96443fed216163f42c':
  Large text support for notifications.
 2014-08-13 05:28:55 +00:00
Svet Ganov
ac3c3cf4ba am d06d9738: am 936a5219: Check accessibility cache integrity only on eng builds. 
* commit 'd06d9738facc6b0fdb7b0081a251f0e03975352d':
  Check accessibility cache integrity only on eng builds.
 2014-08-13 05:21:08 +00:00
Dan Sandler
ea9c58a2b3 am 6eb58ce4: am 0f875bac: Large text support for notifications. 
* commit '6eb58ce4d3646070baffa51ac30334e5a17cb518':
  Large text support for notifications.
 2014-08-13 05:20:59 +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
Dianne Hackborn
83a11f23f8 am 905f8e8b: am 50d61878: Merge "Add 560dpi, and some other stuff." into lmp-dev 
* commit '905f8e8b4b50de019188bec5afa579207b259563':
  Add 560dpi, and some other stuff.
 2014-08-13 04:26:15 +00:00
Svet Ganov
79dea425af Check accessibility cache integrity only on eng builds. 
The checks may have false ositives and spam test logs.

bug:1689853:

Change-Id: I576600192823f159e28ecea29f888187eeceb98b
 2014-08-13 04:06:48 +00:00
Dan Sandler
539aad4570 Large text support for notifications. 
Bug: 7216066
Bug: 15437369
Change-Id: I01a07f04c18d374fc1656f0b1f439a7c33c9d80c
 2014-08-13 04:02:23 +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
Alan Viverette
acc2c07b24 am ae1970d9: am 48286f82: Merge "Add API for obtaining max text length for accessibility" into lmp-dev 
* commit 'ae1970d95d09d717fb795bbc23906d4b4e1503ee':
  Add API for obtaining max text length for accessibility
 2014-08-13 00:39:28 +00:00
Jon Miranda
f49e836ed3 am 0cf789fc: am 2a964260: am fbdf212c: Merge "Changed flow in export methods to continue through the loop if it encounters an int[] return type." into lmp-dev 
* commit '0cf789fc2f081f79079700eee8eef648248f291e':
  Changed flow in export methods to continue through the loop if it encounters an int[] return type.
 2014-08-13 00:14:24 +00:00