OSDN Git Service
Chien-Yu Chen [Thu, 18 Jun 2015 21:09:35 +0000 (21:09 +0000)]
am
df1745a1: am
aca98de4: Merge "ImageWriter: Remove exception for closing twice" into mnc-dev
* commit '
df1745a12bd68f6376a82404a8a4839c43ccd316':
ImageWriter: Remove exception for closing twice
Chien-Yu Chen [Thu, 18 Jun 2015 20:54:38 +0000 (20:54 +0000)]
am
aca98de4: Merge "ImageWriter: Remove exception for closing twice" into mnc-dev
* commit '
aca98de43368a68d1d47c205d8ec8395d4b81376':
ImageWriter: Remove exception for closing twice
Dan Sandler [Thu, 18 Jun 2015 20:47:35 +0000 (20:47 +0000)]
am
8c1ce34b: am
50ec9b1b: Merge "Patch up certain kinds of broken notifications." into mnc-dev
* commit '
8c1ce34b715db2aa3f714540e3735c7b41a4953d':
Patch up certain kinds of broken notifications.
Chien-Yu Chen [Thu, 18 Jun 2015 20:42:19 +0000 (20:42 +0000)]
Merge "ImageWriter: Remove exception for closing twice" into mnc-dev
Hyunyoung Song [Thu, 18 Jun 2015 20:36:46 +0000 (20:36 +0000)]
am
847bcd3a: am
71b44259: Merge "GetInstalledProvidersForProfiles should never return null object." into mnc-dev
* commit '
847bcd3a6dd46fd19984bdb68374cee4c4d36b84':
GetInstalledProvidersForProfiles should never return null object.
Vineeta Srivastava [Thu, 18 Jun 2015 20:36:42 +0000 (20:36 +0000)]
am
10161add: am
7105fd43: Merge "Add config_tether_apndata for Canada MVNO" into mnc-dev
* commit '
10161addd51f5eb65d945fa1832b3aa34892b936':
Add config_tether_apndata for Canada MVNO
Dan Sandler [Thu, 18 Jun 2015 20:35:45 +0000 (20:35 +0000)]
am
50ec9b1b: Merge "Patch up certain kinds of broken notifications." into mnc-dev
* commit '
50ec9b1bd97a04a001dd394885db0cc6f13bea39':
Patch up certain kinds of broken notifications.
Dan Sandler [Thu, 18 Jun 2015 20:26:47 +0000 (20:26 +0000)]
Merge "Patch up certain kinds of broken notifications." into mnc-dev
Hyunyoung Song [Thu, 18 Jun 2015 20:23:13 +0000 (20:23 +0000)]
am
71b44259: Merge "GetInstalledProvidersForProfiles should never return null object." into mnc-dev
* commit '
71b44259829cbc0f6480a1cda68fb9183a0d0ad9':
GetInstalledProvidersForProfiles should never return null object.
Vineeta Srivastava [Thu, 18 Jun 2015 20:23:09 +0000 (20:23 +0000)]
am
7105fd43: Merge "Add config_tether_apndata for Canada MVNO" into mnc-dev
* commit '
7105fd43d288eaa834f2f8cc054cddc6b54af7c4':
Add config_tether_apndata for Canada MVNO
Jason Monk [Thu, 18 Jun 2015 20:22:23 +0000 (20:22 +0000)]
am
54dedc4d: am
3358eb08: Merge "Add way to get the network location provider package" into mnc-dev
* commit '
54dedc4de4a3623ac7f4c4cfcdf11aca65d2035f':
Add way to get the network location provider package
Stefan Kuhne [Thu, 18 Jun 2015 20:22:19 +0000 (20:22 +0000)]
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
Chris Wren [Thu, 18 Jun 2015 20:22:15 +0000 (20:22 +0000)]
am
6d1aa6d5: am
5e275f9f: Merge "instrument volume controls" into mnc-dev
* commit '
6d1aa6d52ea51b6c89cf5dfb61b51e96476bcc45':
instrument volume controls
Hyunyoung Song [Thu, 18 Jun 2015 20:13:34 +0000 (20:13 +0000)]
Merge "GetInstalledProvidersForProfiles should never return null object." into mnc-dev
Vineeta Srivastava [Thu, 18 Jun 2015 20:12:28 +0000 (20:12 +0000)]
Merge "Add config_tether_apndata for Canada MVNO" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 20:10:01 +0000 (20:10 +0000)]
am
3358eb08: Merge "Add way to get the network location provider package" into mnc-dev
* commit '
3358eb084eb445e30d80e4a64d19af901059c399':
Add way to get the network location provider package
Stefan Kuhne [Thu, 18 Jun 2015 20:09:56 +0000 (20:09 +0000)]
am
0925136b: Merge "Fixing voice panel centering issues in landscape on phone" into mnc-dev
* commit '
0925136b22d4fcc69ed8b13675861e2386f3a341':
Fixing voice panel centering issues in landscape on phone
Chris Wren [Thu, 18 Jun 2015 20:09:52 +0000 (20:09 +0000)]
am
5e275f9f: Merge "instrument volume controls" into mnc-dev
* commit '
5e275f9fc0e655a273fc62ce297c9d5a069d7ed7':
instrument volume controls
Jason Monk [Thu, 18 Jun 2015 20:03:28 +0000 (20:03 +0000)]
Merge "Add way to get the network location provider package" into mnc-dev
Hyunyoung Song [Thu, 18 Jun 2015 19:59:51 +0000 (12:59 -0700)]
GetInstalledProvidersForProfiles should never return null object.
b/
21916365
b/
19904873
Change-Id: I296cafd15a185ad91cb7491bd6d2466ac03cdfb7
Sanket Padawe [Thu, 18 Jun 2015 19:59:46 +0000 (19:59 +0000)]
am
87fba5b6: am
3fa285f9: Merge "SubscriptionManager: Fix NPE in getSimStateForSlotIdx" into mnc-dev
* commit '
87fba5b680573e305f934dd1de596618d515a517':
SubscriptionManager: Fix NPE in getSimStateForSlotIdx
Jason Monk [Thu, 18 Jun 2015 19:59:41 +0000 (19:59 +0000)]
am
ea44079e: am
aa2a1966: Merge "Fix some demo mode issues" into mnc-dev
* commit '
ea44079e196b28554d946d5942a1e6a1713e2c1e':
Fix some demo mode issues
Stefan Kuhne [Thu, 18 Jun 2015 19:58:16 +0000 (19:58 +0000)]
Merge "Fixing voice panel centering issues in landscape on phone" into mnc-dev
Chris Wren [Thu, 18 Jun 2015 19:57:48 +0000 (19:57 +0000)]
Merge "instrument volume controls" into mnc-dev
Sanket Padawe [Thu, 18 Jun 2015 19:51:50 +0000 (19:51 +0000)]
am
3fa285f9: Merge "SubscriptionManager: Fix NPE in getSimStateForSlotIdx" into mnc-dev
* commit '
3fa285f93e2810cbd31a71490b364be2b6636d9d':
SubscriptionManager: Fix NPE in getSimStateForSlotIdx
Jason Monk [Thu, 18 Jun 2015 19:45:15 +0000 (19:45 +0000)]
am
aa2a1966: Merge "Fix some demo mode issues" into mnc-dev
* commit '
aa2a19661de088278819fb5b5670ebcada5733f9':
Fix some demo mode issues
Sanket Padawe [Thu, 18 Jun 2015 19:42:49 +0000 (19:42 +0000)]
Merge "SubscriptionManager: Fix NPE in getSimStateForSlotIdx" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 19:37:33 +0000 (19:37 +0000)]
am
34496264: am
7f274f0e: Merge "Fix opening secured networks from QS" into mnc-dev
* commit '
3449626471e2c0946af3a88e3b3e08a94692d481':
Fix opening secured networks from QS
Jason Monk [Thu, 18 Jun 2015 19:32:02 +0000 (19:32 +0000)]
Merge "Fix some demo mode issues" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 19:29:46 +0000 (19:29 +0000)]
am
7f274f0e: Merge "Fix opening secured networks from QS" into mnc-dev
* commit '
7f274f0e1d11e5e70cd55ed93aa467389445636a':
Fix opening secured networks from QS
Jason Monk [Thu, 18 Jun 2015 18:07:26 +0000 (14:07 -0400)]
Fix some demo mode issues
Bug:
21919885
Change-Id: If79d76a2954b62e290691b1c2338d175fdbbffc5
Jason Monk [Thu, 18 Jun 2015 19:19:08 +0000 (19:19 +0000)]
Merge "Fix opening secured networks from QS" into mnc-dev
Dan Sandler [Wed, 17 Jun 2015 19:09:48 +0000 (15:09 -0400)]
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
Sanket Padawe [Thu, 18 Jun 2015 19:08:01 +0000 (12:08 -0700)]
SubscriptionManager: Fix NPE in getSimStateForSlotIdx
bug:
21915589
Change-Id: If703baff6408a0d7ba7c8b02bfd2427b64cda963
Selim Cinek [Thu, 18 Jun 2015 19:04:18 +0000 (19:04 +0000)]
am
85be8992: am
b0a8d2c4: Merge "Fixed a potential bug where the keyguard could become empty" into mnc-dev
* commit '
85be8992a989b5bd1a4aa953c42a6b8acaae9675':
Fixed a potential bug where the keyguard could become empty
Selim Cinek [Thu, 18 Jun 2015 19:04:13 +0000 (19:04 +0000)]
am
cdfe2ef6: am
d6efd00a: Merge "Canceling expand animations as well when starting QS expansion" into mnc-dev
* commit '
cdfe2ef66abfff8e2fbc182966a44b557de23cad':
Canceling expand animations as well when starting QS expansion
Selim Cinek [Thu, 18 Jun 2015 19:04:09 +0000 (19:04 +0000)]
am
cddd3119: am
4c2e9ab9: Merge "Fixed another crash with HUNs" into mnc-dev
* commit '
cddd311948123a5a052aa0fd8ff3efa151df9617':
Fixed another crash with HUNs
Chien-Yu Chen [Thu, 18 Jun 2015 18:55:18 +0000 (11:55 -0700)]
ImageWriter: Remove exception for closing twice
because close() will be called again when GC kicks in.
Bug:
20945169
Change-Id: If3c5a13be241977ccf4692d5301c423b7ff38918
Selim Cinek [Thu, 18 Jun 2015 18:51:21 +0000 (18:51 +0000)]
am
b0a8d2c4: Merge "Fixed a potential bug where the keyguard could become empty" into mnc-dev
* commit '
b0a8d2c4aecb6dfe5f7a95f56ca739fbea6301e5':
Fixed a potential bug where the keyguard could become empty
Selim Cinek [Thu, 18 Jun 2015 18:51:17 +0000 (18:51 +0000)]
am
d6efd00a: Merge "Canceling expand animations as well when starting QS expansion" into mnc-dev
* commit '
d6efd00a6aa78eaf0db34228a5a5846c756ab88b':
Canceling expand animations as well when starting QS expansion
Selim Cinek [Thu, 18 Jun 2015 18:51:13 +0000 (18:51 +0000)]
am
4c2e9ab9: Merge "Fixed another crash with HUNs" into mnc-dev
* commit '
4c2e9ab911855e9dabfcbb0478f167c734a6dacf':
Fixed another crash with HUNs
Stefan Kuhne [Thu, 18 Jun 2015 17:20:33 +0000 (07:20 -1000)]
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
Alan Viverette [Thu, 18 Jun 2015 18:43:22 +0000 (18:43 +0000)]
am
8d207165: am
49e11f80: Merge "Clear/restore calling identity in AccessibilityInteractionClient" into mnc-dev
* commit '
8d207165e51e97c5de5a2075e7f5eae55c94125a':
Clear/restore calling identity in AccessibilityInteractionClient
Selim Cinek [Thu, 18 Jun 2015 18:42:58 +0000 (18:42 +0000)]
Merge "Fixed a potential bug where the keyguard could become empty" into mnc-dev
Selim Cinek [Thu, 18 Jun 2015 18:42:02 +0000 (18:42 +0000)]
Merge "Canceling expand animations as well when starting QS expansion" into mnc-dev
Selim Cinek [Thu, 18 Jun 2015 18:41:39 +0000 (18:41 +0000)]
Merge "Fixed another crash with HUNs" into mnc-dev
Alan Viverette [Thu, 18 Jun 2015 18:31:13 +0000 (18:31 +0000)]
am
49e11f80: Merge "Clear/restore calling identity in AccessibilityInteractionClient" into mnc-dev
* commit '
49e11f805dcf5c8611e4bfbb115e56a22db4a396':
Clear/restore calling identity in AccessibilityInteractionClient
Alan Viverette [Thu, 18 Jun 2015 18:21:58 +0000 (18:21 +0000)]
Merge "Clear/restore calling identity in AccessibilityInteractionClient" into mnc-dev
Adam Lesinski [Thu, 18 Jun 2015 17:54:27 +0000 (17:54 +0000)]
am
aff04038: am
c93f1154: Merge "AAPT2: Remove the need for specifying package name in compile phase" into mnc-dev
* commit '
aff04038c9cd9203a1807f06acfc981231465869':
AAPT2: Remove the need for specifying package name in compile phase
Mady Mellor [Thu, 18 Jun 2015 17:41:22 +0000 (17:41 +0000)]
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
Adam Powell [Thu, 18 Jun 2015 17:41:17 +0000 (17:41 +0000)]
am
7fd90265: am
2a1f9164: Merge "Un-hide ViewGroup#onViewAdded/onViewRemoved" into mnc-dev
* commit '
7fd90265e8927ca84e5e81d8e1ee89f5b022d2ec':
Un-hide ViewGroup#onViewAdded/onViewRemoved
Adam Lesinski [Thu, 18 Jun 2015 17:40:59 +0000 (17:40 +0000)]
am
c93f1154: Merge "AAPT2: Remove the need for specifying package name in compile phase" into mnc-dev
* commit '
c93f115486dfb3e4ec8b7b634e0297024deac5c0':
AAPT2: Remove the need for specifying package name in compile phase
Adam Lesinski [Thu, 18 Jun 2015 17:29:29 +0000 (17:29 +0000)]
Merge "AAPT2: Remove the need for specifying package name in compile phase" into mnc-dev
ztenghui [Thu, 18 Jun 2015 17:29:07 +0000 (17:29 +0000)]
am
6e049b86: am
91870fa2: Merge "Separate 2 clip paths into 2 groups" into mnc-dev
* commit '
6e049b86141e5344ae7a4d42dd5f609b0804c70d':
Separate 2 clip paths into 2 groups
Mady Mellor [Thu, 18 Jun 2015 17:28:04 +0000 (17:28 +0000)]
am
03709c78: Merge "Text selection: update touch delta when moving towards handles" into mnc-dev
* commit '
03709c780ae26a2b27d098782364ba722e711564':
Text selection: update touch delta when moving towards handles
Adam Powell [Thu, 18 Jun 2015 17:28:00 +0000 (17:28 +0000)]
am
2a1f9164: Merge "Un-hide ViewGroup#onViewAdded/onViewRemoved" into mnc-dev
* commit '
2a1f91641895c3193204655bea2f67eb0fe6c439':
Un-hide ViewGroup#onViewAdded/onViewRemoved
Mady Mellor [Thu, 18 Jun 2015 17:26:02 +0000 (17:26 +0000)]
Merge "Text selection: update touch delta when moving towards handles" into mnc-dev
Adam Powell [Thu, 18 Jun 2015 17:20:42 +0000 (17:20 +0000)]
Merge "Un-hide ViewGroup#onViewAdded/onViewRemoved" into mnc-dev
Adam Powell [Wed, 17 Jun 2015 23:41:56 +0000 (16:41 -0700)]
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
ztenghui [Thu, 18 Jun 2015 17:16:31 +0000 (17:16 +0000)]
am
91870fa2: Merge "Separate 2 clip paths into 2 groups" into mnc-dev
* commit '
91870fa281c736b59fb8481e4469da51397c586d':
Separate 2 clip paths into 2 groups
ztenghui [Thu, 18 Jun 2015 17:05:10 +0000 (17:05 +0000)]
Merge "Separate 2 clip paths into 2 groups" into mnc-dev
Jason Monk [Thu, 18 Jun 2015 16:37:03 +0000 (12:37 -0400)]
Fix opening secured networks from QS
Bug:
21908788
Change-Id: I8d1957cc4e0c259b737c5a4d0633edbb1ff57c03
Mady Mellor [Thu, 18 Jun 2015 16:12:09 +0000 (16:12 +0000)]
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
Craig Lafayette [Thu, 18 Jun 2015 16:12:05 +0000 (16:12 +0000)]
am
a4e0fca0: am
b4c46909: Merge "Remove FRP wipe support for device initializers" into mnc-dev
* commit '
a4e0fca089747acb31343428b9bfbbd6224ef93d':
Remove FRP wipe support for device initializers
Mady Mellor [Thu, 18 Jun 2015 15:55:06 +0000 (15:55 +0000)]
am
9a08fe2a: Merge "Update button press in AbsListView to use new MotionEvent APIs" into mnc-dev
* commit '
9a08fe2aca44f190162b198a726bc406ed19c1c7':
Update button press in AbsListView to use new MotionEvent APIs
Craig Lafayette [Thu, 18 Jun 2015 15:55:02 +0000 (15:55 +0000)]
am
b4c46909: Merge "Remove FRP wipe support for device initializers" into mnc-dev
* commit '
b4c469095f12972ef04558961ddbdbdfe8305ccb':
Remove FRP wipe support for device initializers
Mady Mellor [Thu, 18 Jun 2015 15:46:25 +0000 (15:46 +0000)]
Merge "Update button press in AbsListView to use new MotionEvent APIs" into mnc-dev
Craig Lafayette [Thu, 18 Jun 2015 15:44:47 +0000 (15:44 +0000)]
Merge "Remove FRP wipe support for device initializers" into mnc-dev
Wale Ogunwale [Thu, 18 Jun 2015 15:16:55 +0000 (15:16 +0000)]
am
9c4601e4: am
77b09382: Merge "[ActivityManager] Fix index OOB when updating visible." into mnc-dev
* commit '
9c4601e4460fef39fe015087bf92a79cdd96d39f':
[ActivityManager] Fix index OOB when updating visible.
Wale Ogunwale [Thu, 18 Jun 2015 15:04:30 +0000 (15:04 +0000)]
am
77b09382: Merge "[ActivityManager] Fix index OOB when updating visible." into mnc-dev
* commit '
77b093824fac57255dcd181db662f8f5729fe1cc':
[ActivityManager] Fix index OOB when updating visible.
Wale Ogunwale [Thu, 18 Jun 2015 15:00:30 +0000 (15:00 +0000)]
am
8f2bc09f: (-s ours) am
ce7dba6b: Merge "[ActivityManager] Fix index OOB when updating visible."
* commit '
8f2bc09f52db70a6f282f386be3eb19018ba826c':
[ActivityManager] Fix index OOB when updating visible.
Wale Ogunwale [Thu, 18 Jun 2015 14:52:11 +0000 (14:52 +0000)]
Merge "[ActivityManager] Fix index OOB when updating visible." into mnc-dev
Wale Ogunwale [Thu, 18 Jun 2015 14:47:09 +0000 (14:47 +0000)]
am
ce7dba6b: Merge "[ActivityManager] Fix index OOB when updating visible."
* commit '
ce7dba6bdf2345f39ad8f39b8a4c1bac9bcd35ea':
[ActivityManager] Fix index OOB when updating visible.
Wale Ogunwale [Thu, 18 Jun 2015 14:38:20 +0000 (14:38 +0000)]
Merge "[ActivityManager] Fix index OOB when updating visible."
Leon Scroggins III [Thu, 18 Jun 2015 13:23:07 +0000 (13:23 +0000)]
am
eaec64c8: am
8c6750ff: Merge "Fixes for Region_writeToParcel." into mnc-dev
* commit '
eaec64c83703c0c28e18cb2fe602f359454e672a':
Fixes for Region_writeToParcel.
Leon Scroggins III [Thu, 18 Jun 2015 13:09:47 +0000 (13:09 +0000)]
am
8c6750ff: Merge "Fixes for Region_writeToParcel." into mnc-dev
* commit '
8c6750ff0eb2d07039336bf25dc87f10464c42db':
Fixes for Region_writeToParcel.
Leon Scroggins III [Thu, 18 Jun 2015 13:03:32 +0000 (13:03 +0000)]
Merge "Fixes for Region_writeToParcel." into mnc-dev
Clara Bayarri [Thu, 18 Jun 2015 11:46:13 +0000 (11:46 +0000)]
am
3128692f: am
6bc12244: Fix Select All Option is truncated when device goes from landscape to portrait
* commit '
3128692fd4a7d9113becc5bfbd0206413b34ebaa':
Fix Select All Option is truncated when device goes from landscape to portrait
Clara Bayarri [Thu, 18 Jun 2015 11:35:18 +0000 (11:35 +0000)]
am
6bc12244: Fix Select All Option is truncated when device goes from landscape to portrait
* commit '
6bc12244480fcdeca84080d5382d63eb2b992883':
Fix Select All Option is truncated when device goes from landscape to portrait
Clara Bayarri [Tue, 16 Jun 2015 17:04:55 +0000 (18:04 +0100)]
Fix Select All Option is truncated when device goes from landscape to portrait
We were not taking into account configuration changes to update the
available space for the toolbar.
Bug:
21816857
Change-Id: I0f346e8eecb66ab788d1500239d5c1e020b87f97
Selim Cinek [Wed, 17 Jun 2015 22:37:30 +0000 (15:37 -0700)]
Fixed a potential bug where the keyguard could become empty
Bug:
21124013
Change-Id: Ia955b1426e13d47a8f191817d55615253012acb1
Selim Cinek [Wed, 17 Jun 2015 22:09:30 +0000 (15:09 -0700)]
Canceling expand animations as well when starting QS expansion
Bug:
21764741
Change-Id: I065a03e7d594459d8c271d3bd7eb104ac2065b01
Selim Cinek [Wed, 17 Jun 2015 18:17:08 +0000 (11:17 -0700)]
Fixed another crash with HUNs
This time for real :)
Bug:
21868047
Change-Id: I0572dce7d7e5abdf806198b194ad2516a021ab0d
Narayan Kamath [Thu, 18 Jun 2015 10:11:57 +0000 (10:11 +0000)]
am
6cbe0d0f: am
240e48d2: Use consistent cases for aliases in AndroidKeystoreBCWorkaround.
* commit '
6cbe0d0facfd74557204ea47a0fd4590a6420604':
Use consistent cases for aliases in AndroidKeystoreBCWorkaround.
Narayan Kamath [Thu, 18 Jun 2015 09:59:48 +0000 (09:59 +0000)]
am
240e48d2: Use consistent cases for aliases in AndroidKeystoreBCWorkaround.
* commit '
240e48d2e1613a4cb2e4d12de6574732c20e91cb':
Use consistent cases for aliases in AndroidKeystoreBCWorkaround.
Narayan Kamath [Wed, 17 Jun 2015 13:24:14 +0000 (14:24 +0100)]
Use consistent cases for aliases in AndroidKeystoreBCWorkaround.
Should be "with" and not "With". Has the side effect of fixing
a test that assumes that these names are case-sensitive. While the
test must be fixed separately, this is still good for consistency.
bug:
21870226
Change-Id: I884b4abdbb18be064210555aec8e0cd16b0d0bcb
Benjamin Franz [Thu, 18 Jun 2015 06:43:52 +0000 (06:43 +0000)]
am
b953af55: am
9cb6a493: Merge "Add DISALLOW_CREATE_WINDOWS to Device Owner only user restrictions" into mnc-dev
* commit '
b953af556e0e907e3e0046087c6f01e07e133f70':
Add DISALLOW_CREATE_WINDOWS to Device Owner only user restrictions
Erik Kline [Thu, 18 Jun 2015 06:43:47 +0000 (06:43 +0000)]
am
157cccef: am
3d54e672: Merge "Carefully select which DNS servers to send to netd" into mnc-dev
* commit '
157ccceff4fb8f5dcdf2c82a0ba93e3b4e7800d4':
Carefully select which DNS servers to send to netd
Benjamin Franz [Thu, 18 Jun 2015 06:33:02 +0000 (06:33 +0000)]
am
9cb6a493: Merge "Add DISALLOW_CREATE_WINDOWS to Device Owner only user restrictions" into mnc-dev
* commit '
9cb6a493f4e8bd9914f2841355b3293f90773802':
Add DISALLOW_CREATE_WINDOWS to Device Owner only user restrictions
Erik Kline [Thu, 18 Jun 2015 06:32:58 +0000 (06:32 +0000)]
am
3d54e672: Merge "Carefully select which DNS servers to send to netd" into mnc-dev
* commit '
3d54e672a58301ff60498fc7c57870d9bccd0e45':
Carefully select which DNS servers to send to netd
Benjamin Franz [Thu, 18 Jun 2015 06:27:36 +0000 (06:27 +0000)]
Merge "Add DISALLOW_CREATE_WINDOWS to Device Owner only user restrictions" into mnc-dev
Erik Kline [Thu, 18 Jun 2015 06:25:07 +0000 (06:25 +0000)]
Merge "Carefully select which DNS servers to send to netd" into mnc-dev
Hyunyoung Song [Thu, 18 Jun 2015 06:19:15 +0000 (06:19 +0000)]
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
Hyunyoung Song [Thu, 18 Jun 2015 06:09:01 +0000 (06:09 +0000)]
am
0ff78e7c: Merge "AppWidgetServiceImpl should use ParceledListSlice as return object b/
19904873" into mnc-dev
* commit '
0ff78e7cc8f846517d8fd3cefa0c9b88cd94908d':
AppWidgetServiceImpl should use ParceledListSlice as return object b/
19904873
Hyunyoung Song [Thu, 18 Jun 2015 05:58:35 +0000 (05:58 +0000)]
Merge "AppWidgetServiceImpl should use ParceledListSlice as return object b/
19904873" into mnc-dev
Erik Kline [Wed, 17 Jun 2015 04:19:54 +0000 (13:19 +0900)]
Carefully select which DNS servers to send to netd
Select only DNS servers that:
- are reachable, according to routes in the LinkProperties, AND
- have a "suitable" source address in the LinkProperites, meaning:
- IPv4 DNS server:
- only if LinkProperties has any IPv4 address
- IPv6 link-local DNS server:
- only if the server has a scopeId set
- assume for now that LinkProperties has a suitable
link-local address
- IPv6 non-link-local DNS server:
- only if LinkProperties has a global, preferred IPv6 address
Bug:
19470192
Bug:
20733156
Change-Id: Ibd95f3f7b33a4fb6c36d1cea4adb63c99068f657
Seigo Nonaka [Thu, 18 Jun 2015 04:21:17 +0000 (04:21 +0000)]
am
95153de1: am
25d2746b: Merge "Fix IME window flickering during rotation." into mnc-dev
* commit '
95153de1055f31751eb1b58339640f4f1ca09eee':
Fix IME window flickering during rotation.
Seigo Nonaka [Thu, 18 Jun 2015 04:09:05 +0000 (04:09 +0000)]
am
25d2746b: Merge "Fix IME window flickering during rotation." into mnc-dev
* commit '
25d2746b0889d53739bbaf1139e853127f63a2be':
Fix IME window flickering during rotation.
Keisuke Kuroyanagi [Thu, 18 Jun 2015 04:08:37 +0000 (04:08 +0000)]
am
3e43afed: am
fe67c1ec: Merge "Fix: Drag handle jumps between bidi boundaries." into mnc-dev
* commit '
3e43afed48ea49e2ec1f0e65d0600d26da720877':
Fix: Drag handle jumps between bidi boundaries.
Seigo Nonaka [Thu, 18 Jun 2015 03:58:25 +0000 (03:58 +0000)]
Merge "Fix IME window flickering during rotation." into mnc-dev