OSDN Git Service
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
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
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: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
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 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
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: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
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 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: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 14:52:11 +0000 (14:52 +0000)]
Merge "[ActivityManager] Fix index OOB when updating visible." into mnc-dev
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: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 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: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: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: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.
Seigo Nonaka [Thu, 18 Jun 2015 03:58:25 +0000 (03:58 +0000)]
Merge "Fix IME window flickering during rotation." into mnc-dev
Keisuke Kuroyanagi [Thu, 18 Jun 2015 03:56:18 +0000 (03:56 +0000)]
am
fe67c1ec: Merge "Fix: Drag handle jumps between bidi boundaries." into mnc-dev
* commit '
fe67c1ec6d0f08542fad2fc1a3fb858d99d40341':
Fix: Drag handle jumps between bidi boundaries.
Keisuke Kuroyanagi [Thu, 18 Jun 2015 03:43:42 +0000 (03:43 +0000)]
Merge "Fix: Drag handle jumps between bidi boundaries." into mnc-dev
Seigo Nonaka [Wed, 17 Jun 2015 07:04:43 +0000 (16:04 +0900)]
Fix IME window flickering during rotation.
This was introduced by Ifd15736b163ab,
performLayoutAndPlaceSurfacesLocked is called even if
computeNewConfigurationLocked() returns non-null object.
This is simply by mistake and now computeNewConfigurationLocked
never returns null. The only case we need to care is that
mDisplayReady is false, but there is nothing to do with that state.
Thus simply removes if segments from computeNewConfiguration.
Bug:
20823978
Change-Id: I527dfeddffb8d928d578f8d60d64f98557aa3dcb
Seigo Nonaka [Thu, 18 Jun 2015 03:20:19 +0000 (03:20 +0000)]
am
c73cd407: Merge "Allow apps to hide the soft keyboard even in a transient state." into mnc-dev
* commit '
c73cd407f0e886e5d0b26dda6b82d88ac9eec36a':
Allow apps to hide the soft keyboard even in a transient state.
Seigo Nonaka [Thu, 18 Jun 2015 03:10:20 +0000 (03:10 +0000)]
Merge "Allow apps to hide the soft keyboard even in a transient state." into mnc-dev
Abodunrinwa Toki [Thu, 18 Jun 2015 01:17:22 +0000 (01:17 +0000)]
am
e8378476: Merge "Allow content rect to overshoot the bottom view bounds by 20dp." into mnc-dev
* commit '
e8378476b52b215536f0b7c52d2eb611a893685f':
Allow content rect to overshoot the bottom view bounds by 20dp.
Abodunrinwa Toki [Thu, 18 Jun 2015 01:05:03 +0000 (01:05 +0000)]
Merge "Allow content rect to overshoot the bottom view bounds by 20dp." into mnc-dev
Tomasz Mikolajewski [Thu, 18 Jun 2015 00:23:57 +0000 (00:23 +0000)]
am
41ce0039: Merge "Remove the action bar icon when there is no drawer enabled." into mnc-dev
* commit '
41ce003934c228f68e82645062665e0d2c443781':
Remove the action bar icon when there is no drawer enabled.
Pavlin Radoslavov [Thu, 18 Jun 2015 00:23:53 +0000 (00:23 +0000)]
am
512fb0ca: Sync the Bluetooth name and address from the Bluetooth Adapter
* commit '
512fb0ca900128cb682491a7f85e20c17edd8481':
Sync the Bluetooth name and address from the Bluetooth Adapter
Tomasz Mikolajewski [Thu, 18 Jun 2015 00:15:51 +0000 (00:15 +0000)]
Merge "Remove the action bar icon when there is no drawer enabled." into mnc-dev
Pavlin Radoslavov [Thu, 18 Jun 2015 00:01:23 +0000 (17:01 -0700)]
Sync the Bluetooth name and address from the Bluetooth Adapter
It looks like the synchronization of the Bluetooth name and address
from the Bluetooth Adapter has been removed by the following commit
without an explanation:
Bluetooth LE background operation mode (2/2)
As a result, the BluetoothManagerService.mAddress was always null.
Bug:
20545952
Change-Id: I595f370e06e17b2c67ce511f793efdee7674598c
Dongwon Kang [Thu, 18 Jun 2015 00:03:01 +0000 (00:03 +0000)]
am
c7c12e56: Merge "Make MediaSessionService not blocked by AudioService." into mnc-dev
* commit '
c7c12e5639c170cb7ba3d3b492f9455b8b6bb9b4':
Make MediaSessionService not blocked by AudioService.
Tomasz Mikolajewski [Thu, 18 Jun 2015 00:02:57 +0000 (00:02 +0000)]
am
9ce9ffec: Merge "Allow to customize title of the dialog." into mnc-dev
* commit '
9ce9ffec9e307e29c3d575854d4e357ecf06d2d8':
Allow to customize title of the dialog.
Xiaohui Chen [Thu, 18 Jun 2015 00:02:53 +0000 (00:02 +0000)]
am
802ece61: Merge "system_server: add two child chains to firewall" into mnc-dev
* commit '
802ece61399e94bbe98cafaa277c71bee73c03ba':
system_server: add two child chains to firewall
Dongwon Kang [Wed, 17 Jun 2015 23:51:11 +0000 (23:51 +0000)]
Merge "Make MediaSessionService not blocked by AudioService." into mnc-dev
Tomasz Mikolajewski [Wed, 17 Jun 2015 23:51:05 +0000 (23:51 +0000)]
Merge "Allow to customize title of the dialog." into mnc-dev
Xiaohui Chen [Wed, 17 Jun 2015 23:50:23 +0000 (23:50 +0000)]
Merge "system_server: add two child chains to firewall" into mnc-dev
ztenghui [Wed, 17 Jun 2015 21:59:01 +0000 (14:59 -0700)]
Separate 2 clip paths into 2 groups
Since 2 clip paths is taking the intersection as the final clip, we should
separate this test case into 2 groups.
Prior to M release, the 2nd clip path is overriding the first one.
The behavior changed in this CL:
e9c01a40a2f0f0da195dfbb2909aaee5c005d1c6
b/
16376848
b/
19946683
Change-Id: Ib21c95e70f1317321725acbbe0ccf91713f748c3
Winson Chung [Wed, 17 Jun 2015 23:44:39 +0000 (23:44 +0000)]
am
8b9730f7: Merge "Fixing issue with recents not being hidden for translucent apps." into mnc-dev
* commit '
8b9730f749498491ceb80c86261ee5b8398c7f25':
Fixing issue with recents not being hidden for translucent apps.
Winson Chung [Wed, 17 Jun 2015 23:30:49 +0000 (23:30 +0000)]
Merge "Fixing issue with recents not being hidden for translucent apps." into mnc-dev
Winson Chung [Wed, 17 Jun 2015 23:03:54 +0000 (16:03 -0700)]
Fixing issue with recents not being hidden for translucent apps.
- When tapping home, we can't depend on the stack state to determine
whether or not hide recents since there can be translucent windows
above it. In this case, we just dismiss recents directly since the
receiver will only be registered while recents is visible.
Bug:
20110140
Change-Id: I6b796cc4cbd790aac9a0857549e34117adb808d8
Tomasz Mikolajewski [Fri, 12 Jun 2015 23:22:17 +0000 (16:22 -0700)]
Allow to customize title of the dialog.
TEST=adb shell am start -a android.intent.action.OPEN_DOCUMENT -e
android.intent.extra.TITLE 'Upload!' -t "text/plain"
BUG=
19150996
Change-Id: Ibded6cfaa2de3698c5eada154efbee2b323464d4
Chet Haase [Wed, 17 Jun 2015 23:11:47 +0000 (23:11 +0000)]
am
45bb0ca4: Merge "ImageView updates cached drawable dimensions when drawable updates" into mnc-dev
* commit '
45bb0ca49a052cd6da3e4ced7709372972abdf55':
ImageView updates cached drawable dimensions when drawable updates
Raph Levien [Wed, 17 Jun 2015 23:11:43 +0000 (23:11 +0000)]
am
8872ca4d: Merge "Remove indents from TextView" into mnc-dev
* commit '
8872ca4d558a8546c9c934f32fd37d261a6f32d1':
Remove indents from TextView
Winson Chung [Wed, 17 Jun 2015 23:11:38 +0000 (23:11 +0000)]
am
1bf92935: Merge "Fixing a few accessibility issues." into mnc-dev
* commit '
1bf929350149eb0f669e3aba886c6b0c62b35774':
Fixing a few accessibility issues.
Chet Haase [Wed, 17 Jun 2015 23:06:58 +0000 (23:06 +0000)]
Merge "ImageView updates cached drawable dimensions when drawable updates" into mnc-dev
Raph Levien [Wed, 17 Jun 2015 23:06:16 +0000 (23:06 +0000)]
Merge "Remove indents from TextView" into mnc-dev
Winson Chung [Wed, 17 Jun 2015 22:59:29 +0000 (22:59 +0000)]
Merge "Fixing a few accessibility issues." into mnc-dev
Xiaohui Chen [Wed, 17 Jun 2015 22:55:37 +0000 (15:55 -0700)]
system_server: add two child chains to firewall
This is an attempt to speed up getting out of device idle. It groups
uid firewall rules in these child chains so we can attach/detach a whole
chain instead of individual uid rules.
BUG:
21446713
Change-Id: Ie8f392da2deabe7cc86a9ecf4ed080163861d41e
Raph Levien [Wed, 17 Jun 2015 22:53:33 +0000 (15:53 -0700)]
Remove indents from TextView
On more careful reflection, the "indents" feature was not ready for
inclusion in the public API. It is still available at a lower level
in StaticLayout.
Also fix a minor typo in the doc for breakStrategy.
Bug:
20641996
Change-Id: I5cd976a536c48615980860396b1564b51b19e14a
Adam Powell [Wed, 17 Jun 2015 22:51:01 +0000 (22:51 +0000)]
am
40359f73: Merge "Request application of WindowInsets when setting a content view" into mnc-dev
* commit '
40359f73b189fc8547dd91e6b75a4243b23553ef':
Request application of WindowInsets when setting a content view
Adam Powell [Wed, 17 Jun 2015 22:42:16 +0000 (22:42 +0000)]
Merge "Request application of WindowInsets when setting a content view" into mnc-dev
Dongwon Kang [Tue, 16 Jun 2015 22:28:17 +0000 (15:28 -0700)]
Make MediaSessionService not blocked by AudioService.
Backgroud: As noted in b/
20823981, MediaSessionService calls some
audio service methods while holding a lock and the audio service
methods also talk to other system services. And, deadlock happens when
the other system service fires another request to MediaSessionService
while holding its lock.
Example1) --- resolved by the change in MediaSessionRecord.java
T1: MediaSessionService.dispatchAdjustVolumeLocked()
-> MediaSessionRecord.adjustVolume()
-> +++AudioServiceInternal.adjustSuggestedStreamVolumeForUid()+++
-> AudioService.adjustSuggestedStreamVolume()
-> telecom.TelecomManager.isInCall() --- blocked by lock in TelecomManager.
T2: telecom.ConnectionServiceWrapper.handleCreateConnectionComplete()
-> MediaSession.setActive()
-> MediaSessionRecord$SessionStub.setActive()
-> MediaSessionService.updateSession() --- blocked by lock in MediaSessionService.
Example2) --- resolved by the change in IAudioService.aidl
T1: MediaSessionService.dispatchAdjustVolumeLocked()
-> IAudioService.adjustSuggestedStreamVolume()
-> AudioService.adjustSuggestedStreamVolume()
-> telecom.TelecomManager.isInCall() --- blocked by lock in TelecomManager.
T2: telecom.ConnectionServiceWrapper.handleCreateConnectionComplete()
-> MediaSession.setActive()
-> MediaSessionRecord$SessionStub.setActive()
-> MediaSessionService.updateSession() --- blocked by lock in MediaSessionService.
Here, this change prevents the deadlock by making related audio IPC oneway
and calling the internal audio method without holding the lock.
Bug:
20823981
Change-Id: I4c4b2fc796f23d83be67f7edaacd7496c145d985
Alan Viverette [Wed, 17 Jun 2015 22:33:54 +0000 (15:33 -0700)]
Clear/restore calling identity in AccessibilityInteractionClient
To quote sendAccessibilityEvent(), "it is possible that this manager is
in the same process as the service but client using it is called through
Binder from another process."
Bug:
21737301
Change-Id: I8d4699a0ca8187a12235741ce420948061798f27
Alan Viverette [Wed, 17 Jun 2015 22:31:12 +0000 (22:31 +0000)]
am
2b18e42b: Merge "Seekbar track background alpha should be disabledAlpha" into mnc-dev
* commit '
2b18e42b7beeeb657ba739e46478e4353d3aca71':
Seekbar track background alpha should be disabledAlpha
Dianne Hackborn [Wed, 17 Jun 2015 22:31:07 +0000 (22:31 +0000)]
am
22433a33: Merge "Fix issue #
21814207 and issue #
21814212 (alarm manager)" into mnc-dev
* commit '
22433a337a712aafbf23df965fa0457ccee3399b':
Fix issue #
21814207 and issue #
21814212 (alarm manager)
Chet Haase [Wed, 17 Jun 2015 21:43:30 +0000 (14:43 -0700)]
ImageView updates cached drawable dimensions when drawable updates
Changes to drawable dimensions were not propagated to cached dimension
values in ImageView. Now this is done when the drawable is invalidated.
Issue #
18798152 ImageView caches wrong value of mDrawableWidth and mDrawableHeight
Change-Id: I8da7d82b0543fa02d8ef3d896595bd0e5ea2a61e
Hyunyoung Song [Wed, 17 Jun 2015 22:23:31 +0000 (15:23 -0700)]
AppWidgetServiceImpl should use ParceledListSlice as return object
b/
19904873
> Reason: to prevent TransactionTooLargeException from occuring when
binder transaction size goes over the limit.
Change-Id: I054cb161d235234f3ccdaadd70314163e690b0db
Alan Viverette [Wed, 17 Jun 2015 22:21:54 +0000 (22:21 +0000)]
am
0d96264b: Merge "Revert spinner caret size to 24x24dp" into mnc-dev
* commit '
0d96264bb63a884f658d3333525120616fc839ee':
Revert spinner caret size to 24x24dp
Alan Viverette [Wed, 17 Jun 2015 22:21:50 +0000 (22:21 +0000)]
am
e1c94726: Merge "Work around inconsistent views in RelativeLayout.onMeasure()" into mnc-dev
* commit '
e1c947263f1b72510f244458d9cef76883691801':
Work around inconsistent views in RelativeLayout.onMeasure()
Alan Viverette [Wed, 17 Jun 2015 22:20:20 +0000 (22:20 +0000)]
Merge "Seekbar track background alpha should be disabledAlpha" into mnc-dev