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
Adam Skory
965c47902a
Merge "Update api/current.txt"
2013-09-11 17:33:19 +00:00
Adam Skory
4591f1f2d8
Merge "Fix bad references in preloaded-classes"
2013-09-11 17:33:05 +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
6eee22a73f
am 91df3f3f: am ecf612a1: am eacfc308: am a0b259a9: am 161e423e: Merge "docs: Fixed deprecated value. Bug: 10641906" into jb-mr2-docs
...
* commit '91df3f3f0fb9c76864c3dfd94f7762d0bf7c6275':
docs: Fixed deprecated value. Bug: 10641906
2013-09-11 10:22:45 -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
Adam Skory
d3f96c8436
Update api/current.txt
...
Needed to run make update-api after
the merge resolution http://ag/357417
Change-Id: I46746646905a6684988baff448d6f131f7b84ac0
2013-09-11 18:11:55 +01:00
John Spurlock
b5d90ec386
am 7bb21556: am ec7a6ea8: Merge "Add activity indicator icons to quick settings tiles." into klp-dev
...
* commit '7bb21556e7e012163fcad56924ca3d9a644d540e':
Add activity indicator icons to quick settings tiles.
2013-09-11 10:11:32 -07:00
Chet Haase
ae277d89aa
am a22f4e98: am c19d683d: Merge "Build layer immediately when setting it in ViewPropertyAnimator" into klp-dev
...
* commit 'a22f4e981a668025d059ca1710403aedb6a6ac30':
Build layer immediately when setting it in ViewPropertyAnimator
2013-09-11 10:11:30 -07:00
Chet Haase
d8d3c0f0b8
am 48cad812: am a8e17653: Merge "Reversing immediately after starting animator ends it" into klp-dev
...
* commit '48cad812301421bad981ed343d84e683de2fc1f1':
Reversing immediately after starting animator ends it
2013-09-11 10:11:26 -07:00
Daniel Sandler
defb56f692
am d6360a28: am ab6284f1: Merge "New orange color for status bar + qs assets." into klp-dev
...
* commit 'd6360a28af56da80cfcc8afad46b4510b4374cbd':
New orange color for status bar + qs assets.
2013-09-11 10:11:22 -07:00
John Spurlock
c995b8d6f2
am 79897c0d: am 79ec2a15: Don\'t rely on window state when disabling the panel.
...
* commit '79897c0db03448c3465159999e1ffd0296e23cee':
Don't rely on window state when disabling the panel.
2013-09-11 10:11:19 -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
Baligh Uddin
8d2d844a91
Import translations. DO NOT MERGE
...
Change-Id: Ib53dd615609a9ecb1ac6b260f0824a0647c2194a
Auto-generated-cl: translation import
2013-09-11 10:09:06 -07:00
Adam Skory
09aab4dd12
Fix bad references in preloaded-classes
...
http://ag/352924 renamed INdefPushCallback
to IAppCallback. Update preloaded-classes
to reflect this.
Change-Id: Id552e94e3a01cdd61593480f3c0aedb32d185f80
2013-09-11 18:06:25 +01: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
Adam Skory
a7cda03a47
resolved conflicts for merge of 7d17de35 to master
...
Conflicts:
core/res/res/values/public.xml
Change-Id: I14b4e332be7ef27e76a2773a504cb942bd0642ef
2013-09-11 16:16:19 +01: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
Narayan Kamath
3f94640e26
Fix a few synchronization issues in WifiMonitor.
...
- Guard all field accesses in WifiMonitorSingleton with
a lock.
- WifiMonitorSingleton is now responsible for dispatching
events to a given monitor (or all monitors if it can't
find a matching monitor).
- Individual WifiMonitors are now responsible for dispatching
events sent to them. This makes WifiMonitorThread a dumb
object. All it does is wait for events and feed them back
into the WifiMonitorSingleton.
- Also fixes a bug where we weren't telling the WifiMonitor
that we're disconnected and another where we don't check whether
a monitor is connected or not before asking it to dispatch
an event.
- Also, replaces a few uses of entrySet() with a values() iterator
when the keys are never used. The performance of both methods
is identical for a HashMap, but the latter is a bit more concise
and easier to read.
Change-Id: I7ce00174a78c72836666d25ccc5e6e9e687c2570
2013-09-11 13:00:01 +00: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