Shawn Willden
4c25a00e83
am bb399afc: am 687b3259: am 09614808: Merge "Reflect removal of KM_TAG_AEAD_TAG from keymaster." into mnc-dev
...
* commit 'bb399afc52375cdadcc1a68ef9032b0957e9f47b':
Reflect removal of KM_TAG_AEAD_TAG from keymaster.
2015-06-19 14:18:34 +00:00
Dianne Hackborn
6c32b58bf1
am 50bf0203: am 1594edce: am 0348ba2e: Merge "Fix issue #20494208 : Go out of device idle when headset button is pressed" into mnc-dev
...
* commit '50bf0203b9ed0ac5c72ad6b2e2fcc1a6737bb565':
Fix issue #20494208 : Go out of device idle when headset button is pressed
2015-06-19 14:17:59 +00:00
Adam Lesinski
6c2a8e0da8
am 9f0179cc: am a0578a02: am 00fac635: Merge "BatteryStats: Fix regression in wakelock power distribution" into mnc-dev
...
* commit '9f0179cc5f6f74a6b9957f60526353898f02ac0b':
BatteryStats: Fix regression in wakelock power distribution
2015-06-19 14:17:52 +00:00
Dan Sandler
2983f6ee42
am 2a0cc6cf: am 7a7e8fc8: am 11859eba: Merge "Announce chronometers with time-unit words." into mnc-dev
...
* commit '2a0cc6cf4dc61e03d5bb5348177cca95aeb0257d':
Announce chronometers with time-unit words.
2015-06-19 14:17:45 +00:00
Shawn Willden
bb399afc52
am 687b3259: am 09614808: Merge "Reflect removal of KM_TAG_AEAD_TAG from keymaster." into mnc-dev
...
* commit '687b32591b29442a5c2d181e7acd72a94ce93eab':
Reflect removal of KM_TAG_AEAD_TAG from keymaster.
2015-06-19 13:59:03 +00:00
Dianne Hackborn
50bf0203b9
am 1594edce: am 0348ba2e: Merge "Fix issue #20494208 : Go out of device idle when headset button is pressed" into mnc-dev
...
* commit '1594edcea1e8862827410f2542d19c5edb403cbe':
Fix issue #20494208 : Go out of device idle when headset button is pressed
2015-06-19 13:58:20 +00:00
Adam Lesinski
9f0179cc5f
am a0578a02: am 00fac635: Merge "BatteryStats: Fix regression in wakelock power distribution" into mnc-dev
...
* commit 'a0578a025949b0759dbd6109b60c2c560b03b2d5':
BatteryStats: Fix regression in wakelock power distribution
2015-06-19 13:58:09 +00:00
Dan Sandler
2a0cc6cf4d
am 7a7e8fc8: am 11859eba: Merge "Announce chronometers with time-unit words." into mnc-dev
...
* commit '7a7e8fc83c5b362427aa061002e928ab7f7721cf':
Announce chronometers with time-unit words.
2015-06-19 13:58:04 +00:00
Shawn Willden
0961480879
Merge "Reflect removal of KM_TAG_AEAD_TAG from keymaster." into mnc-dev
2015-06-19 03:16:55 +00:00
Alex Klyubin
42abb74834
Reflect removal of KM_TAG_AEAD_TAG from keymaster.
...
This reflects the changes in da89dde9787dfbd8c053119ab52d9e671106b18e
in system/keymaster.
Bug: 19919114
Change-Id: I9cdfc7ce63099c4de29029b1fc112369c4a68eba
2015-06-18 18:43:45 -07:00
Dianne Hackborn
0348ba2e23
Merge "Fix issue #20494208 : Go out of device idle when headset button is pressed" into mnc-dev
2015-06-19 01:01:38 +00:00
Adam Lesinski
00fac63575
Merge "BatteryStats: Fix regression in wakelock power distribution" into mnc-dev
2015-06-19 00:57:47 +00:00
Dan Sandler
11859eba4e
Merge "Announce chronometers with time-unit words." into mnc-dev
2015-06-19 00:50:59 +00:00
Dianne Hackborn
b6683c4286
Fix issue #20494208 : Go out of device idle when headset button is pressed
...
Rework how we record active transitions in battery stats to be
more general, and add an API that others can call in to
DeviceIdleController to request that we go out of idle mode.
use this for VOICE_SEARCH_HANDS_FREE.
Change-Id: Ie58de60e63036a4142881283835961fbcceec892
2015-06-18 17:40:33 -07:00
Christopher Tate
c6c902963c
am ff69c55e: am 528e9abe: am 728b7500: Merge "Document possible null returns in PackageManager" into mnc-dev
...
* commit 'ff69c55eb078060b4bd7cd2e16ebe35229957356':
Document possible null returns in PackageManager
2015-06-18 21:21:44 +00:00
Christopher Tate
ff69c55eb0
am 528e9abe: am 728b7500: Merge "Document possible null returns in PackageManager" into mnc-dev
...
* commit '528e9abeef938179f58714cc3fea4bb8362fd9b6':
Document possible null returns in PackageManager
2015-06-18 21:09:39 +00:00
Dan Sandler
7d8e2f656d
am 0e51f73d: am 8c1ce34b: am 50ec9b1b: Merge "Patch up certain kinds of broken notifications." into mnc-dev
...
* commit '0e51f73d9e8b7d0c731163411f74c74a697a4ed3':
Patch up certain kinds of broken notifications.
2015-06-18 20:55:57 +00:00
Christopher Tate
728b7500b3
Merge "Document possible null returns in PackageManager" into mnc-dev
2015-06-18 20:53:12 +00:00
Christopher Tate
abe6580199
Document possible null returns in PackageManager
...
In particular queryIntentServices() but also a few others.
Bug 19127758
Change-Id: I590605ce4870b2ab300385678df8917cfade60f9
2015-06-18 13:48:42 -07:00
Dan Sandler
0e51f73d9e
am 8c1ce34b: am 50ec9b1b: Merge "Patch up certain kinds of broken notifications." into mnc-dev
...
* commit '8c1ce34b715db2aa3f714540e3735c7b41a4953d':
Patch up certain kinds of broken notifications.
2015-06-18 20:47:35 +00:00
Stefan Kuhne
b03e387bb0
am 6d2f38c3: am 55353cfb: am 0925136b: Merge "Fixing voice panel centering issues in landscape on phone" into mnc-dev
...
* commit '6d2f38c3f00df48bdabac8a9a25001166ddc600f':
Fixing voice panel centering issues in landscape on phone
2015-06-18 20:38:24 +00:00
Dan Sandler
50ec9b1bd9
Merge "Patch up certain kinds of broken notifications." into mnc-dev
2015-06-18 20:26:49 +00:00
Stefan Kuhne
6d2f38c3f0
am 55353cfb: am 0925136b: Merge "Fixing voice panel centering issues in landscape on phone" into mnc-dev
...
* commit '55353cfbdc70365c3a9cce5700111d4033416aad':
Fixing voice panel centering issues in landscape on phone
2015-06-18 20:22:19 +00:00
Stefan Kuhne
0925136b22
Merge "Fixing voice panel centering issues in landscape on phone" into mnc-dev
2015-06-18 19:58:24 +00:00
Dan Sandler
4e78706f43
Patch up certain kinds of broken notifications.
...
Notifications in which the icon resource ID is changed after
Builder.build() is called (even, and particularly, as the
last step in the current implementation of
setLatestEventInfo()) were not having their icons properly
parceled. In these cases we now attempt to catch this at
parcel time and construct the necessary Icon object.
But wait! Parceling does not require a Context. So we don't
actually know which package to load the resource from.
Therefore we now allow an Icon to be constructed with an
empty ("") package name, which allows us to complete this
parceling task despite the fact that a Notification does not
know its own package name. (In case you attempt to load a
drawable for such an Icon, loadDrawable will spot the ""
package and instead substitute the Context from its
parameters to try to load the resource.)
As it happens, even though the Notification does not know
its own package name, BaseStatusBar does, because it was
provided at NM.notify() time and is therefore included in
the StatusBarNotification structure. So we can actually
patch up the Icon (if it is TYPE_RESOURCE) and be sure to
get the icon loaded out of the correct package.
While we've got the hood open, this change fixes a couple of
related problems:
• Foreground service notifications synthetically
constructed for naughty icon==0 notifications (which we
are still allowing...FOR NOW) were losing the
FLAG_FOREGROUND_SERVICE flag (because we're
re-build()-ing them from scratch rather than rewriting
the provided Notification object). Now we set the flag
and hang onto the new notification for next time
setForeground() is called.
• We now allow media notifications to avoid getting bumped
to the top of the notification list if they're
PRIORITY_MIN. You might want to do that, I guess?
Bug: 21333763
Change-Id: Ia5d1f1acb594c7677bcc75ee3d624da4ffca671f
2015-06-18 15:12:44 -04:00
Adam Lesinski
72478f053f
BatteryStats: Fix regression in wakelock power distribution
...
We used to give 50% of the cpu time of each app to any app holding a wakelock
while the screen is off.
Since we switched to the new kernel module for measuring app's cpu time, this distribution
was lost.
Bug:21876567
Change-Id: I42c294547f63d150d9929271ca0e27fedaaa9d77
2015-06-18 12:09:25 -07:00
Alan Viverette
29dc8d1951
am 5c1693c2: am 8d207165: am 49e11f80: Merge "Clear/restore calling identity in AccessibilityInteractionClient" into mnc-dev
...
* commit '5c1693c289b9e7b08a2a870e9a3c5bc20766334e':
Clear/restore calling identity in AccessibilityInteractionClient
2015-06-18 18:57:57 +00:00
Stefan Kuhne
2f280d0639
Fixing voice panel centering issues in landscape on phone
...
The new assist panel (long press on home) was not centered in landscape
mode on phones. This was caused by ignoring the stable insets in the
PhoneWindowManager.
bug: 21708971
Change-Id: I97a968a41c2966b09eba496fbe57c840affdf9ec
2015-06-18 08:44:04 -10:00
Alan Viverette
5c1693c289
am 8d207165: am 49e11f80: Merge "Clear/restore calling identity in AccessibilityInteractionClient" into mnc-dev
...
* commit '8d207165e51e97c5de5a2075e7f5eae55c94125a':
Clear/restore calling identity in AccessibilityInteractionClient
2015-06-18 18:43:22 +00:00
Alan Viverette
49e11f805d
Merge "Clear/restore calling identity in AccessibilityInteractionClient" into mnc-dev
2015-06-18 18:22:08 +00:00
Mady Mellor
06b9ede565
am 5765561f: am a0993670: am 03709c78: Merge "Text selection: update touch delta when moving towards handles" into mnc-dev
...
* commit '5765561fa63e102721ef845767543859a28e9d1a':
Text selection: update touch delta when moving towards handles
2015-06-18 17:57:56 +00:00
Adam Powell
ed213cfea3
am 0f6dd549: am 7fd90265: am 2a1f9164: Merge "Un-hide ViewGroup#onViewAdded/onViewRemoved" into mnc-dev
...
* commit '0f6dd54943f3b343406c655d3efc392ede0cf0ea':
Un-hide ViewGroup#onViewAdded/onViewRemoved
2015-06-18 17:57:51 +00:00
Mady Mellor
5765561fa6
am a0993670: am 03709c78: Merge "Text selection: update touch delta when moving towards handles" into mnc-dev
...
* commit 'a0993670bccbca2b5149d301e7f7f3447faa9338':
Text selection: update touch delta when moving towards handles
2015-06-18 17:41:22 +00:00
Adam Powell
0f6dd54943
am 7fd90265: am 2a1f9164: Merge "Un-hide ViewGroup#onViewAdded/onViewRemoved" into mnc-dev
...
* commit '7fd90265e8927ca84e5e81d8e1ee89f5b022d2ec':
Un-hide ViewGroup#onViewAdded/onViewRemoved
2015-06-18 17:41:17 +00:00
Mady Mellor
03709c780a
Merge "Text selection: update touch delta when moving towards handles" into mnc-dev
2015-06-18 17:26:04 +00:00
Adam Powell
2a1f916418
Merge "Un-hide ViewGroup#onViewAdded/onViewRemoved" into mnc-dev
2015-06-18 17:20:44 +00:00
Adam Powell
6690d018b9
Un-hide ViewGroup#onViewAdded/onViewRemoved
...
These methods are generally useful for writing custom views, and by
exposing them we make it easier for custom view authors to still allow
app developers to use an OnHierarchyChangedListener since it will not
be occupied by a custom view's implementation.
Also move the actual dispatch to package-scoped dispatch methods so
that a developer forgetting to call super won't stop a listener from
functioning.
Bug 21866523
Change-Id: Ie2bb5e241d7c5a02a5033f33ecdaeb40aceb20b5
2015-06-18 10:19:18 -07:00
Mady Mellor
2b48782e36
am fd597de3: am 0bbabc03: am 9a08fe2a: Merge "Update button press in AbsListView to use new MotionEvent APIs" into mnc-dev
...
* commit 'fd597de38eb4477846be8046e96b2ab7cc68d183':
Update button press in AbsListView to use new MotionEvent APIs
2015-06-18 16:19:40 +00:00
Craig Lafayette
9faad27a1e
am 2cabb0da: am a4e0fca0: am b4c46909: Merge "Remove FRP wipe support for device initializers" into mnc-dev
...
* commit '2cabb0da0c5b09f3736c61a7eea74ee947182702':
Remove FRP wipe support for device initializers
2015-06-18 16:19:34 +00:00
Mady Mellor
fd597de38e
am 0bbabc03: am 9a08fe2a: Merge "Update button press in AbsListView to use new MotionEvent APIs" into mnc-dev
...
* commit '0bbabc031a29fe13cdf767896abcd5c1e0ea2c5a':
Update button press in AbsListView to use new MotionEvent APIs
2015-06-18 16:12:09 +00:00
Craig Lafayette
2cabb0da0c
am a4e0fca0: am b4c46909: Merge "Remove FRP wipe support for device initializers" into mnc-dev
...
* commit 'a4e0fca089747acb31343428b9bfbbd6224ef93d':
Remove FRP wipe support for device initializers
2015-06-18 16:12:05 +00:00
Mady Mellor
9a08fe2aca
Merge "Update button press in AbsListView to use new MotionEvent APIs" into mnc-dev
2015-06-18 15:46:27 +00:00
Craig Lafayette
b4c469095f
Merge "Remove FRP wipe support for device initializers" into mnc-dev
2015-06-18 15:44:49 +00:00
Hyunyoung Song
0fe8e6a5f5
am 02cf3fc0: am d90fadcc: am 0ff78e7c: Merge "AppWidgetServiceImpl should use ParceledListSlice as return object b/19904873" into mnc-dev
...
* commit '02cf3fc008ee98eec7fbe4682556c3bd923bdd91':
AppWidgetServiceImpl should use ParceledListSlice as return object b/19904873
2015-06-18 06:33:30 +00:00
Hyunyoung Song
02cf3fc008
am d90fadcc: am 0ff78e7c: Merge "AppWidgetServiceImpl should use ParceledListSlice as return object b/19904873" into mnc-dev
...
* commit 'd90fadcc0bbbe729b03b913ee96c6e43c1d9c662':
AppWidgetServiceImpl should use ParceledListSlice as return object b/19904873
2015-06-18 06:19:15 +00:00
Hyunyoung Song
0ff78e7cc8
Merge "AppWidgetServiceImpl should use ParceledListSlice as return object b/19904873" into mnc-dev
2015-06-18 05:58:36 +00:00
Keisuke Kuroyanagi
12b92e57eb
am 4e0ff9c1: am 3e43afed: am fe67c1ec: Merge "Fix: Drag handle jumps between bidi boundaries." into mnc-dev
...
* commit '4e0ff9c124315a9dfbf987136f933a6e433c63f9':
Fix: Drag handle jumps between bidi boundaries.
2015-06-18 04:25:33 +00:00
Keisuke Kuroyanagi
4e0ff9c124
am 3e43afed: am fe67c1ec: Merge "Fix: Drag handle jumps between bidi boundaries." into mnc-dev
...
* commit '3e43afed48ea49e2ec1f0e65d0600d26da720877':
Fix: Drag handle jumps between bidi boundaries.
2015-06-18 04:08:37 +00:00
Keisuke Kuroyanagi
fe67c1ec6d
Merge "Fix: Drag handle jumps between bidi boundaries." into mnc-dev
2015-06-18 03:43:44 +00:00
Tomasz Mikolajewski
58461ebdef
am 87a45380: am 456778ff: am 9ce9ffec: Merge "Allow to customize title of the dialog." into mnc-dev
...
* commit '87a4538034d41964ed81b69749939c1868505847':
Allow to customize title of the dialog.
2015-06-18 00:31:20 +00:00