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

39771 Commits

Author SHA1 Message Date
Prerepa Viswanadham
979fb6de5a am 54bb367b: am 66e02987: am d58dee86: Protect from malformed advt with invalid manf_id/data combo 
* commit '54bb367b62727c5f9afd94b190d928d3e6a7325d':
  Protect from malformed advt with invalid manf_id/data combo
 2014-08-14 18:10:16 +00:00
Prerepa Viswanadham
4b9b02c431 am c334bbb3: am 5550c2b1: am 011101fe: Prevent crash in Gatt service due to null pointer in BluetoothGattCharacteristic from framework 
* commit 'c334bbb38986787a8aaf51b6208990454aa86a06':
  Prevent crash in Gatt service due to null pointer in BluetoothGattCharacteristic from framework
 2014-08-14 18:10:11 +00:00
Prerepa Viswanadham
b8035fda5d am 66e02987: am d58dee86: Protect from malformed advt with invalid manf_id/data combo 
* commit '66e02987b45cb9d04c6bca790dcb3da612e81529':
  Protect from malformed advt with invalid manf_id/data combo
 2014-08-14 18:02:58 +00:00
Prerepa Viswanadham
2a2da65137 am 5550c2b1: am 011101fe: Prevent crash in Gatt service due to null pointer in BluetoothGattCharacteristic from framework 
* commit '5550c2b101541300c8fa52989e4a98949319bd2a':
  Prevent crash in Gatt service due to null pointer in BluetoothGattCharacteristic from framework
 2014-08-14 18:02:51 +00:00
Wei Wang
babb9bc8d0 am c08732d1: am f7dfa984: am b5d9d07e: Merge "Clean up advertise and scan clients upon bluetooth down." into lmp-dev 
* commit 'c08732d131512fbdf96903189d19ff27fac2386e':
  Clean up advertise and scan clients upon bluetooth down.
 2014-08-14 17:57:13 +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
Jeff Brown
f431a9fc43 am 31012592: am f281eea3: am 79bdc4d1: Log who is calling goToSleep(). 
* commit '310125927fa5afd965f613d535db52343f0f5427':
  Log who is calling goToSleep().
 2014-08-14 17:56:42 +00:00
Dianne Hackborn
5049a2d5ee am dc7692a4: am 0bfe8aea: am b60a62ca: Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into lmp-dev 
* commit 'dc7692a4b36736c79633b4ef48eecbe68a9b9057':
  Fix issue #16794553: Duplicate ArrayMap entries in Bundle...
 2014-08-14 17:56:27 +00:00
Wei Wang
b54b014dd3 am f7dfa984: am b5d9d07e: Merge "Clean up advertise and scan clients upon bluetooth down." into lmp-dev 
* commit 'f7dfa984b57be7ed39b07f26cf9c74a2501a62a2':
  Clean up advertise and scan clients upon bluetooth down.
 2014-08-14 17:47:41 +00:00
Jose Lima
95f3c34848 am 06804518: am d361d4f9: Made AlarmClockInfo a nested class in AlarmManager 
* commit '068045187ef2b6011633b3a0bf273030ecb6d664':
  Made AlarmClockInfo a nested class in AlarmManager
 2014-08-14 17:47:08 +00:00
Jose Lima
f082842f2b am b991fd6e: am ec8834a3: Renamed "media playing" APIs to "visible behind" 
* commit 'b991fd6ec57b0f59e20f85a9cb9c63ac9d0ab98a':
  Renamed "media playing" APIs to "visible behind"
 2014-08-14 17:47:02 +00:00
Jeff Brown
d1ee11da70 am f281eea3: am 79bdc4d1: Log who is calling goToSleep(). 
* commit 'f281eea327ed9020333746cc77e48636662231b6':
  Log who is calling goToSleep().
 2014-08-14 17:46:57 +00:00
Dianne Hackborn
ab843022e2 am 0bfe8aea: am b60a62ca: Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into lmp-dev 
* commit '0bfe8aea12144bfdcc34673c5b14309f141d4de7':
  Fix issue #16794553: Duplicate ArrayMap entries in Bundle...
 2014-08-14 17:46:42 +00:00
Prerepa Viswanadham
621085e50f Protect from malformed advt with invalid manf_id/data combo 
Bug: 16979645
Change-Id: Ie7ea00ed20cbad1120c7582bb2bafd44b4295052
 2014-08-14 05:33:11 +00:00
Prerepa Viswanadham
ee3cc8bf17 Prevent crash in Gatt service due to null pointer in 
BluetoothGattCharacteristic from framework

Bug 16899517

Change-Id: Ib30ddefee07c2953f9a7faeb4eaa823feeebdc8f
 2014-08-14 05:32:06 +00:00
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
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
Jeff Brown
c12035cd40 Log who is calling goToSleep(). 
Change-Id: Ibae61c90ee115735835e878bb3bf79eedaa0ae44
 2014-08-14 01:56:48 +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
Dianne Hackborn
9c3e74f1f7 Fix issue #16794553: Duplicate ArrayMap entries in Bundle... 
...can lead to launching of un-exported activities

We now validate the array map after unparcelling to make sure there
are no duplicate keys.

And to make up for the performance overhead this introduces, I switched
the parcelling/unparcelling code to write keys as explicit string
objects rather than generic values.  There was no reason to use generic
values since the write method itself only accepts an array map with
String keys.

Change-Id: I57bda9eb79ceaaa9c1b94ad49d9e462b52102149
 2014-08-13 17:24:45 -07: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