drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
113,637 Commits 1 Branch 0 Tags
Commit Graph

113637 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom O'Neill
0494832fc6 am 706113fa: Merge "Improve some javadoc related to isProviderEnabled() apis" into klp-dev 
* commit '706113fa2a82e5b613b8555120025b8472ffcbf3':
  Improve some javadoc related to isProviderEnabled() apis
 2013-09-11 12:23:39 -07:00
Tom O'Neill
706113fa2a Merge "Improve some javadoc related to isProviderEnabled() apis" into klp-dev 2013-09-11 19:20:16 +00:00
Santos Cordon
07d545e08d am e0b7e4cf: Merge "Add permissions for the InCallUI Split." into klp-dev 
* commit 'e0b7e4cf455b21316661b158edee12ac5467995c':
  Add permissions for the InCallUI Split.
 2013-09-11 12:10:13 -07:00
Alexander Ray
b0049151f7 am 7563d423: Merge "Add consumer IR framework" into klp-dev 
* commit '7563d42331ed7df7f026c8921ae990ce2fca9efd':
  Add consumer IR framework
 2013-09-11 12:10:06 -07:00
Santos Cordon
e0b7e4cf45 Merge "Add permissions for the InCallUI Split." into klp-dev 2013-09-11 19:08:34 +00:00
Sandeep Siddhartha
6c5e9fb4c4 am f702286c: Merge "Remove HotwordRecognition APIs" into klp-dev 
* commit 'f702286c94f0df9fc147135c19f12ef34e8594c9':
  Remove HotwordRecognition APIs
 2013-09-11 12:06:29 -07:00
Alexander Ray
7563d42331 Merge "Add consumer IR framework" into klp-dev 2013-09-11 19:05:38 +00:00
Sandeep Siddhartha
f702286c94 Merge "Remove HotwordRecognition APIs" into klp-dev 2013-09-11 19:01:51 +00:00
Baligh Uddin
86ad10f874 Import translations. DO NOT MERGE 
Change-Id: I2dfe3d6bca7948bce139f0f0f1404214ad8c99f2
Auto-generated-cl: translation import
 2013-09-11 11:51:26 -07:00
Baligh Uddin
38a3dfdb9e Import translations. DO NOT MERGE 
Change-Id: I6f30db92a5f2fa7f6c6073b6b9c530ae0436583b
Auto-generated-cl: translation import
 2013-09-11 11:49:10 -07:00
Baligh Uddin
243a2c4293 Import translations. DO NOT MERGE 
Change-Id: I92fdf6e34e65d70e813b5f3f5139659fb0eab2ce
Auto-generated-cl: translation import
 2013-09-11 11:46:30 -07:00
Baligh Uddin
ca892360a0 Import translations. DO NOT MERGE 
Change-Id: I41d53a68f479490dab20dc25d2d020ec098a1ff8
Auto-generated-cl: translation import
 2013-09-11 11:45:08 -07:00
Kenny Root
0d6c2d7b9d Reconcile differences between zip implementations 
Reconcile the difference between ZipFileRO and java.util.ZipFile to have
the same behavior.

Bug: 10424836
Change-Id: I6bde1bad7e20065ee650945fd43a913c05ce5ac7
 2013-09-11 11:44:40 -07:00
Igor Murashkin
47869404cb am 2cad64c0: Merge "Surface: Change OutOfResourcesException to be a runtime exception" into klp-dev 
* commit '2cad64c0fbeba07bb546674e19cfb0166d7ec332':
  Surface: Change OutOfResourcesException to be a runtime exception
 2013-09-11 11:30:14 -07:00
Victoria Lease
5d345dbe31 am 444ae3a2: Merge "include Padauk in fallback chain" into klp-dev 
* commit '444ae3a2e66b4404fa715ab46403da09079dd572':
  include Padauk in fallback chain
 2013-09-11 11:30:11 -07:00
Amith Yamasani
dd9157ce31 am b926d484: Merge "Handle the case where the restore environment doesn\'t have the ringtone" into klp-dev 
* commit 'b926d484a76eda4152ba46d3ef517517226ca699':
  Handle the case where the restore environment doesn't have the ringtone
 2013-09-11 11:30:08 -07:00
Igor Murashkin
2cad64c0fb Merge "Surface: Change OutOfResourcesException to be a runtime exception" into klp-dev 2013-09-11 18:28:07 +00:00
Victoria Lease
444ae3a2e6 Merge "include Padauk in fallback chain" into klp-dev 2013-09-11 18:27:59 +00:00
Amith Yamasani
b926d484a7 Merge "Handle the case where the restore environment doesn't have the ringtone" into klp-dev 2013-09-11 18:27:53 +00:00
Baligh Uddin
e5147ca951 Import translations. DO NOT MERGE 
Change-Id: I218b96b7b7984751f31982cfcd6e574f6f0a813d
Auto-generated-cl: translation import
 2013-09-11 11:17:09 -07:00
Dianne Hackborn
33f92b6fe2 am c1cf491d: Merge "More on issue #10130785: Restore silence and vibrate settings..." into klp-dev 
* commit 'c1cf491d160f8feb74b24d4ebb4e39324850cf61':
  More on issue #10130785: Restore silence and vibrate settings...
 2013-09-11 11:16:44 -07:00
Kenny Root
4a0be803a9 am b5f694f6: Merge "Revert "Reconcile differences between zip implementations"" into klp-dev 
* commit 'b5f694f683cb85b308f3733a3507a98fbff0532c':
  Revert "Reconcile differences between zip implementations"
 2013-09-11 11:16:40 -07:00
Baligh Uddin
caaf6979f3 Import translations. DO NOT MERGE 
Change-Id: I00a9521d0ac1e2463268295d1ea09f2894b1618c
Auto-generated-cl: translation import
 2013-09-11 11:15:47 -07:00
Dianne Hackborn
c1cf491d16 Merge "More on issue #10130785: Restore silence and vibrate settings..." into klp-dev 2013-09-11 18:13:17 +00:00
Kenny Root
b5f694f683 Merge "Revert "Reconcile differences between zip implementations"" into klp-dev 2013-09-11 18:11:34 +00:00
Amith Yamasani
2e804444d6 Handle the case where the restore environment doesn't have the ringtone 
Bug: 10130785

uncanonicalize() can return a null now, so abort restoring the ringtone
in that case.

Change-Id: I28765818c8d3e1fb3f271afdfe66ebc955cfcefe
 2013-09-11 11:11:19 -07:00
Kenny Root
0c4b3646b0 Revert "Reconcile differences between zip implementations" 
This reverts commit 9ffddc7eb50653cf60ce6b27a0e1945eed5b5ce1.

Change-Id: Ifeba63511211bfc2b375f2205e319e91403b7d06
 2013-09-11 18:10:09 +00:00
Jonathan Dixon
42513ca1a6 am caee47f0: Merge "Preparation for deleting WebViewClassic" into klp-dev 
* commit 'caee47f096403068f02c41a91f8dad1aa5d13169':
  Preparation for deleting WebViewClassic
 2013-09-11 11:05:42 -07:00
Dianne Hackborn
b3ac67a0ec More on issue #10130785: Restore silence and vibrate settings... 
...in settings > sound

ContentResolver.uncanonicalize needs to be able to fail.

Change-Id: I347ef60fc3619aae203b87079579597c60be8b90
 2013-09-11 11:04:21 -07:00
Baligh Uddin
7dac9d13b8 Import translations. DO NOT MERGE 
Change-Id: Ida1a70718ad0bc4216a7089385f2a62fe0111544
Auto-generated-cl: translation import
 2013-09-11 11:03:11 -07:00
Tom O'Neill
d5759437ee Improve some javadoc related to isProviderEnabled() apis 
- LocationManager.isProviderEnabled() no longer throws SecurityException:
the caller could already circumvent the permission check by calling
Secure.isLocationProviderEnabled()

Change-Id: I5abd04264299671ed35ce4594b5be46d86378767
 2013-09-11 11:03:03 -07:00
Sandeep Siddhartha
65a6ba3478 Remove HotwordRecognition APIs 
- and its usage from Keyguard

Bug: 10708010
Change-Id: Ic4a695a1d0e9312706a3b4ff01e59e2567b6ad9c
 2013-09-11 11:01:13 -07:00
Jonathan Dixon
caee47f096 Merge "Preparation for deleting WebViewClassic" into klp-dev 2013-09-11 17:59:42 +00:00
Martijn Coenen
ae8b57a5f3 am b7e5692b: Merge "Add support for loading banners from HCE services." into klp-dev 
* commit 'b7e5692b62cf0f3f1b02d8dc1008f3faf12df584':
  Add support for loading banners from HCE services.
 2013-09-11 10:54:51 -07:00
Adam Skory
f8f6ef0204 am abc7f543: am 427e92a2: Merge "Fix bad references in preloaded-classes" into klp-dev 
* commit 'abc7f5438c2b63864ba964f155d1efe7ea006803':
  Fix bad references in preloaded-classes
 2013-09-11 10:52:26 -07:00
Martijn Coenen
b7e5692b62 Merge "Add support for loading banners from HCE services." into klp-dev 2013-09-11 17:52:18 +00:00
Dianne Hackborn
03422d2626 am e9aad4ae: Merge "Fix issue #10688644: Java crash in com.android.phone:" into klp-dev 
* commit 'e9aad4ae31caeb00f95d83119c2020f4cb5f345c':
  Fix issue #10688644: Java crash in com.android.phone:
 2013-09-11 10:49:10 -07:00
Adam Skory
abc7f5438c am 427e92a2: Merge "Fix bad references in preloaded-classes" into klp-dev 
* commit '427e92a2652c3962df42fc63bc009986c4e15839':
  Fix bad references in preloaded-classes
 2013-09-11 10:49:06 -07:00
Dianne Hackborn
e9aad4ae31 Merge "Fix issue #10688644: Java crash in com.android.phone:" into klp-dev 2013-09-11 17:46:13 +00:00
Chris Craik
27569f2447 am a180fd6d: am 68fbe16b: Merge "Avoid ref-ing AndroidPixelRefs that wrap others in globalRef/Unref" into klp-dev 
* commit 'a180fd6d67819a45bafc052581d43c0ecc1faccf':
  Avoid ref-ing AndroidPixelRefs that wrap others in globalRef/Unref
 2013-09-11 10:45:28 -07:00
Kenny Root
ef60bdaa96 am feaa3be3: am 139ae547: Merge "Reconcile differences between zip implementations" into klp-dev 
* commit 'feaa3be34fae96f00d672b4be8b5cdc90126de76':
  Reconcile differences between zip implementations
 2013-09-11 10:45:24 -07:00
Adam Skory
427e92a265 Merge "Fix bad references in preloaded-classes" into klp-dev 2013-09-11 17:44:15 +00:00
Chris Craik
a180fd6d67 am 68fbe16b: Merge "Avoid ref-ing AndroidPixelRefs that wrap others in globalRef/Unref" into klp-dev 
* commit '68fbe16ba0072326c1c6b09817f46ccdc5ee15b9':
  Avoid ref-ing AndroidPixelRefs that wrap others in globalRef/Unref
 2013-09-11 10:42:09 -07:00
Kenny Root
feaa3be34f am 139ae547: Merge "Reconcile differences between zip implementations" into klp-dev 
* commit '139ae5477f2df8aef40f0689371b055a438a72af':
  Reconcile differences between zip implementations
 2013-09-11 10:42:04 -07:00
Yuhao Zheng
c726dcb803 am 05e7e345: am 518c0afa: Merge "Fix for the toggle airplane mode hidden API" into klp-dev 
* commit '05e7e3450006438311b18d6b0be920ad5579782a':
  Fix for the toggle airplane mode hidden API
 2013-09-11 10:41:55 -07:00
Chris Craik
68fbe16ba0 Merge "Avoid ref-ing AndroidPixelRefs that wrap others in globalRef/Unref" into klp-dev 2013-09-11 17:40:39 +00:00
Yuhao Zheng
05e7e34500 am 518c0afa: Merge "Fix for the toggle airplane mode hidden API" into klp-dev 
* commit '518c0afaea02f9a680f6912bde2d73b0357236ca':
  Fix for the toggle airplane mode hidden API
 2013-09-11 10:38:36 -07:00
Kenny Root
139ae5477f Merge "Reconcile differences between zip implementations" into klp-dev 2013-09-11 17:38:26 +00:00
Adam Skory
aae67e11bc Fix bad references in preloaded-classes 
http://ag/352924 renamed INdefPushCallback
to IAppCallback. Update preloaded-classes
to reflect this.

This is a cherry-pick of Id552e94e3a01cdd61593480f3c0aedb32d185f80

Change-Id: I0901f14fb41f94e3c7572c09e090ec5903a878d1
 2013-09-11 18:35:33 +01:00
Yuhao Zheng
518c0afaea Merge "Fix for the toggle airplane mode hidden API" into klp-dev 2013-09-11 17:35:09 +00:00