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

112549 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Baligh Uddin
7f5ebcd4f9 Import translations. DO NOT MERGE 
Change-Id: Ib84e443010cb0673afbce92137370d11b393c17c
Auto-generated-cl: translation import
 2013-09-11 10:28:35 -07:00
quddusc
91df3f3f0f am ecf612a1: am eacfc308: am a0b259a9: am 161e423e: Merge "docs: Fixed deprecated value. Bug: 10641906" into jb-mr2-docs 
* commit 'ecf612a15c6201d7a4c55f0fcceb077f3e9ad84e':
  docs: Fixed deprecated value. Bug: 10641906
 2013-09-11 10:19:49 -07:00
quddusc
ecf612a15c am eacfc308: am a0b259a9: am 161e423e: Merge "docs: Fixed deprecated value. Bug: 10641906" into jb-mr2-docs 
* commit 'eacfc308344b34d27b7cd2ab8cc0fbdefbcc8167':
  docs: Fixed deprecated value. Bug: 10641906
 2013-09-11 10:17:41 -07:00
quddusc
eacfc30834 am a0b259a9: am 161e423e: Merge "docs: Fixed deprecated value. Bug: 10641906" into jb-mr2-docs 
* commit 'a0b259a917f9c7cf73b4e8ceab104cdab4383c24':
  docs: Fixed deprecated value. Bug: 10641906
 2013-09-11 10:15:12 -07:00
quddusc
a0b259a917 am 161e423e: Merge "docs: Fixed deprecated value. Bug: 10641906" into jb-mr2-docs 
* commit '161e423ead0e2272ebb0b73957abf0c916ad57ff':
  docs: Fixed deprecated value. Bug: 10641906
 2013-09-11 10:09:45 -07:00
Dianne Hackborn
95d785346b Fix issue #10688644: Java crash in com.android.phone: 
java.lang.SecurityException: Operation not allowed

There was a situation I wasn't taking into account -- components
declared by the system has a special ability to run in the processes
of other uids.  This means that if that code loaded into another
process tries to do anything needing an app op verification, it will
fail, because it will say it is calling as the system package name but
it is not actually coming from the system uid.

To fix this, we add a new Context.getOpPackageName() to go along-side
getBasePackageName().  This is a special call for use by all app ops
verification, which will be initialized with either the base package
name, the actual package name, or now the default package name of the
process if we are creating a context for system code being loaded into
a non-system process.

I had to update all of the code doing app ops checks to switch to this
method to get the calling package name.

Also improve the security exception throw to have a more descriptive
error message.

Change-Id: Ic04f77b3938585b02fccabbc12d2f0dc62b9ef25
 2013-09-11 09:59:47 -07:00
Erik Gilling
51e95df8f2 Add consumer IR framework 
Change-Id: I786c00db0cce61ef75e4edc24e90f2cdcba6dbfb
 2013-09-11 09:52:47 -07:00
Victoria Lease
36d4cc8d2b include Padauk in fallback chain 
Bug: 10625246
Change-Id: I32530a992beeafe2ee16da36f0dc0a752c647cc6
(cherry picked from commit 5d34e4d679e6237b0d075177d1e365161c684445)

Conflicts:
	data/fonts/fallback_fonts.xml
 2013-09-11 09:52:29 -07:00
Yuhao Zheng
5530e4b5d4 Fix for the toggle airplane mode hidden API 
Fix to https://googleplex-android-review.git.corp.google.com/#/c/356900/
Previous implementation throws SecurityException when the API is called from apps.
bug:10653570

Change-Id: I95ae6f07db74d881f1a8d3d40a6486105a068e90
 2013-09-11 09:44:28 -07:00
Jeff Sharkey
aca405cd59 Fix SDK build. 
Change-Id: Ib12748478cb1b42621454ab2035fb8f3163b6ac8
 2013-09-11 09:14:16 -07:00
John Spurlock
7bb21556e7 am ec7a6ea8: Merge "Add activity indicator icons to quick settings tiles." into klp-dev 
* commit 'ec7a6ea84578be91e04a54331ea4ca63e7fb69e1':
  Add activity indicator icons to quick settings tiles.
 2013-09-11 07:51:25 -07:00
John Spurlock
ec7a6ea845 Merge "Add activity indicator icons to quick settings tiles." into klp-dev 2013-09-11 14:50:08 +00:00
Chet Haase
a22f4e981a am c19d683d: Merge "Build layer immediately when setting it in ViewPropertyAnimator" into klp-dev 
* commit 'c19d683d9ea5dafdd8e355dc3fa34b362bc379e9':
  Build layer immediately when setting it in ViewPropertyAnimator
 2013-09-11 07:17:05 -07:00
Chet Haase
48cad81230 am a8e17653: Merge "Reversing immediately after starting animator ends it" into klp-dev 
* commit 'a8e176534cb086cdf925b0ab0fbd7c2859a1de44':
  Reversing immediately after starting animator ends it
 2013-09-11 07:17:02 -07:00
Chet Haase
c19d683d9e Merge "Build layer immediately when setting it in ViewPropertyAnimator" into klp-dev 2013-09-11 14:14:06 +00:00
Chet Haase
a8e176534c Merge "Reversing immediately after starting animator ends it" into klp-dev 2013-09-11 14:13:48 +00:00
John Spurlock
43670879fa Add activity indicator icons to quick settings tiles. 
Wifi + RSSI now have activity in / activity out indicators
wired up to information coming from NetworkController.

Bug: 10634208
Change-Id: I3cf29dc905eeaeb4aea8e7df4fe46e70645e0013
 2013-09-11 10:04:44 -04:00
Daniel Sandler
d6360a28af am ab6284f1: Merge "New orange color for status bar + qs assets." into klp-dev 
* commit 'ab6284f1e0224fcbf07de5bd0c1e9ed58509946a':
  New orange color for status bar + qs assets.
 2013-09-11 06:53:36 -07:00
John Spurlock
79897c0db0 am 79ec2a15: Don\'t rely on window state when disabling the panel. 
* commit '79ec2a15f791ca583c97fa8de772347f93cec568':
  Don't rely on window state when disabling the panel.
 2013-09-11 06:53:32 -07:00
Daniel Sandler
ab6284f1e0 Merge "New orange color for status bar + qs assets." into klp-dev 2013-09-11 13:51:19 +00:00
John Spurlock
79ec2a15f7 Don't rely on window state when disabling the panel. 
Bug:10488453
Change-Id: I09ffbf166dd34489064cf0d73fe7ae4dd356c6c9
 2013-09-11 09:28:49 -04:00
John Spurlock
8a6c77545b New orange color for status bar + qs assets. 
Bug:10502089
Change-Id: I7b43fe260ceccba29f896009ce467fe29ec67f64
 2013-09-11 08:37:43 -04:00
Adam Skory
7d17de357a am 86d9c457: Merge "Revert services assist context in KitKat" into klp-dev 
* commit '86d9c457de3285f01552d4046a8a260c7a75147f':
  Revert services assist context in KitKat
 2013-09-11 04:46:13 -07:00
Adam Skory
86d9c457de Merge "Revert services assist context in KitKat" into klp-dev 2013-09-11 11:27:50 +00:00
Adam Skory
7140a25f01 Revert services assist context in KitKat 
Reverts extension to assist context API to query
foreground services for assist context data.

Also hides Intent.ACTION_VOICE_ASSIST because
nobody's actually using it yet.

Bug: 10461702
Change-Id: Idf6836adc659b434e11ebb2b98e8b814c94a7227
 2013-09-11 12:04:58 +01:00
Marc Wilson
02ff99c839 am e3af2dd7: Merge "Update documentation for speech APIs." into klp-dev 
* commit 'e3af2dd7a7883c5ae60fd6b9f6fb8d434e12d66a':
  Update documentation for speech APIs.
 2013-09-11 03:52:45 -07:00