OSDN Git Service
Jason Monk [Tue, 14 Jul 2015 17:49:51 +0000 (17:49 +0000)]
am
fe03a84b: Merge "Fix QS labels on language change" into mnc-dev
* commit '
fe03a84bc6d59e9b09029cfa8800bd9ef8d85d18':
Fix QS labels on language change
Jason Monk [Tue, 14 Jul 2015 17:40:21 +0000 (17:40 +0000)]
Merge "Fix QS labels on language change" into mnc-dev
Marco Nelissen [Tue, 14 Jul 2015 17:35:22 +0000 (17:35 +0000)]
am
3ced9617: Merge "Use original path if translated path doesn\'t exist" into mnc-dev
* commit '
3ced96178b1b132705e773736cbb707a3a0cd951':
Use original path if translated path doesn't exist
Craig Lafayette [Tue, 14 Jul 2015 17:35:15 +0000 (17:35 +0000)]
am
2f0116fa: Merge "Prevent null allowableAccounts from crashing" into mnc-dev
* commit '
2f0116fa3ab2153188e43e87b194afae7e4efb81':
Prevent null allowableAccounts from crashing
Marco Nelissen [Tue, 14 Jul 2015 17:30:03 +0000 (17:30 +0000)]
Merge "Use original path if translated path doesn't exist" into mnc-dev
Craig Lafayette [Tue, 14 Jul 2015 17:25:37 +0000 (17:25 +0000)]
Merge "Prevent null allowableAccounts from crashing" into mnc-dev
Chris Craik [Tue, 14 Jul 2015 17:13:23 +0000 (17:13 +0000)]
am
941bcedb: Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev
* commit '
941bcedb4c03832cd54225217697c7b8cba6e07c':
Fix unsafety in SkiaShader storage, and texture unit accounting
Chris Craik [Tue, 14 Jul 2015 16:57:58 +0000 (16:57 +0000)]
Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev
Alex Klyubin [Tue, 14 Jul 2015 16:30:41 +0000 (16:30 +0000)]
am
10633c96: Merge "Fix Android Keystore key factories to obey JCA contract." into mnc-dev
* commit '
10633c96b55d13f05304b758b01be48035adece3':
Fix Android Keystore key factories to obey JCA contract.
Jason Monk [Tue, 14 Jul 2015 16:29:28 +0000 (12:29 -0400)]
Fix QS labels on language change
Some tiles now won't do updates if the state hasn't changed (rotation) to avoid
breaking the animation state. To handle this, state is cleared when the
configuration changes.
Bug:
22206214
Change-Id: I029fb4c75cc920a6c9907b65e8c48d28c21d529a
Alex Klyubin [Tue, 14 Jul 2015 16:15:58 +0000 (16:15 +0000)]
Merge "Fix Android Keystore key factories to obey JCA contract." into mnc-dev
Yohei Yukawa [Tue, 14 Jul 2015 15:44:37 +0000 (15:44 +0000)]
am
12952c79: Merge "Allow FloatingToolbar to be outside of the attached window." into mnc-dev
* commit '
12952c79528cd7ea804c400e5908a24e56f69bbe':
Allow FloatingToolbar to be outside of the attached window.
Yohei Yukawa [Tue, 14 Jul 2015 15:34:29 +0000 (15:34 +0000)]
Merge "Allow FloatingToolbar to be outside of the attached window." into mnc-dev
Ronghua Wu [Tue, 14 Jul 2015 15:33:31 +0000 (15:33 +0000)]
am
148c7c5c: Merge "media: Implement getAchievableFrameRatesFor with measured frame rate." into mnc-dev
* commit '
148c7c5c1794a9e306660f22c7cbbbc9906e5f5e':
media: Implement getAchievableFrameRatesFor with measured frame rate.
Marco Nelissen [Tue, 14 Jul 2015 15:22:47 +0000 (08:22 -0700)]
Use original path if translated path doesn't exist
Bug:
22376538
Change-Id: I2f6af4fa31c097e2e2d619a068cf83721091c450
Ronghua Wu [Tue, 14 Jul 2015 15:21:30 +0000 (15:21 +0000)]
Merge "media: Implement getAchievableFrameRatesFor with measured frame rate." into mnc-dev
Craig Lafayette [Tue, 14 Jul 2015 14:48:46 +0000 (10:48 -0400)]
Prevent null allowableAccounts from crashing
The javadoc for newChooseAccountIntent says that a null
value for the allowableAccounts parameter is valid and
an acceptable default. This CL makes sure that when this
parameter is null, a NullPointerException is not thrown.
Bug:
22475546
Change-Id: Ieb0d67dd02628e1ae5629499b3be3c6382efc9aa
Andrei Stingaceanu [Tue, 14 Jul 2015 14:17:19 +0000 (14:17 +0000)]
am
8af7432c: Merge "Fix "Select All" in extracted mode" into mnc-dev
* commit '
8af7432ca3fc1ce3539997d24439954f0e64134c':
Fix "Select All" in extracted mode
Andrei Stingaceanu [Tue, 14 Jul 2015 14:03:18 +0000 (14:03 +0000)]
Merge "Fix "Select All" in extracted mode" into mnc-dev
Julia Reynolds [Tue, 14 Jul 2015 13:57:31 +0000 (13:57 +0000)]
am
f5e20ec3: Merge "Retrieve resources for apps, even if not installed for current user." into mnc-dev
* commit '
f5e20ec36480897f4c37fd63554872e74d874f02':
Retrieve resources for apps, even if not installed for current user.
Julia Reynolds [Tue, 14 Jul 2015 13:47:42 +0000 (13:47 +0000)]
Merge "Retrieve resources for apps, even if not installed for current user." into mnc-dev
Julia Reynolds [Tue, 14 Jul 2015 13:24:22 +0000 (09:24 -0400)]
Retrieve resources for apps, even if not installed for current user.
Bug:
21448052
Change-Id: Id5db428a6faca4a905684088c47e070752ac2899
Yohei Yukawa [Tue, 14 Jul 2015 12:59:05 +0000 (05:59 -0700)]
Allow FloatingToolbar to be outside of the attached window.
Currently PopupWindow used for the floating toolbar specifies
neither FLAG_LAYOUT_NO_LIMITS nor FLAG_LAYOUT_IN_SCREEN.
As a result, the floating toolbar can overlap the selected
text when the attached window does not have enough height.
Here is the repro code.
final TextView textView = new TextView(this);
textView.setLayoutParams(
new ViewGroup.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT));
textView.setText("A test sentence.");
textView.setTextIsSelectable(true);
final AlertDialog dialog = new AlertDialog.Builder(this)
.setView(textView)
.create();
dialog.getWindow().setGravity(Gravity.BOTTOM)
dialog.show();
If you tap a word in the dialog, the floating toolbar
unintentionally overlaps the selected text due to the limited
height of the AlertDialog.
It also turns out that just calling
PopupWindow.setClippingEnabled(false)
to specify FLAG_LAYOUT_NO_LIMITS is not sufficient and ends up
showing the toolbar on the NavBar because we have mistakenly
compared bounds in window-local coordinates
(e.g. FloatingActionModemContentRectOnWindow) with bounds in
screen coordinates (e.g. FloatingActionMode#mScreenRect).
Hence the confusion of window-local coordinates and screen
coordinates in FloatingToolbar and FloatingToolbar also needs
to be addresses.
To summarize here are the notable changes in this CL:
- Specify FLAG_LAYOUT_NO_LIMITS so that the floating
toolbar can be placed outside of the attached window.
(We do this with PopupWindow#setClippingEnabled)
- Switch to use screen coordinates from window-local
coordiantes in FloatingToolbar and FloatingActionMode
because some system components such as WindowManager
prefer screen coordinates.
- Put -OnScreen suffix for Rect and Point variables
as long as they are in screen coordinates.
Bug:
22335001
Change-Id: I71a8d356e868dc7715b030ca1078da4ec39368c3
Andrei Stingaceanu [Tue, 30 Jun 2015 14:48:11 +0000 (15:48 +0100)]
Fix "Select All" in extracted mode
Stop calling onExtractTextContextMenuItem if "Select All"
is selected (the action does not modify text thus does
not need batch editing). Editor#finishBatchEdit reports
that text changed which in turn can stop the action mode
and the selection after it was started by onPreDraw.
Bug:
22059417
Change-Id: I5354cbe4bae374e0d5f3de39616336170ee33b92
Andrei Stingaceanu [Tue, 14 Jul 2015 10:14:48 +0000 (10:14 +0000)]
am
a9b9907f: Merge "Fix insertion handle disappearing in extract mode" into mnc-dev
* commit '
a9b9907f3c472e70d0950964d3e2c83c4926af14':
Fix insertion handle disappearing in extract mode
Andrei Stingaceanu [Tue, 14 Jul 2015 09:57:20 +0000 (09:57 +0000)]
Merge "Fix insertion handle disappearing in extract mode" into mnc-dev
Erik Kline [Tue, 14 Jul 2015 04:21:18 +0000 (04:21 +0000)]
am
77612940: Merge "Log NetworkRequestInfo to get more detailed history" into mnc-dev
* commit '
776129402746be08d52bb9f0901f6ecd63b25399':
Log NetworkRequestInfo to get more detailed history
Erik Kline [Tue, 14 Jul 2015 04:09:25 +0000 (04:09 +0000)]
Merge "Log NetworkRequestInfo to get more detailed history" into mnc-dev
Zach Johnson [Tue, 14 Jul 2015 03:49:15 +0000 (03:49 +0000)]
am
569ff225: Fix BluetoothSocket file descriptor leak
* commit '
569ff225a3879363bb31548a664161fee5270a0d':
Fix BluetoothSocket file descriptor leak
Zach Johnson [Tue, 14 Jul 2015 01:00:35 +0000 (18:00 -0700)]
Fix BluetoothSocket file descriptor leak
Sockets accepted on a server socket didn't populate
the mPfd field, which is used to close out the java
end of the native-and-java communication socket when
the overall rfcomm socket is closed. #badnewsbears
b/
21398841
Change-Id: I3adb0a9965f83d0f3006fa4f79ea4abeab5c9a17
Svet Ganov [Tue, 14 Jul 2015 02:49:27 +0000 (02:49 +0000)]
Erik Kline [Thu, 9 Jul 2015 09:24:03 +0000 (18:24 +0900)]
Log NetworkRequestInfo to get more detailed history
Bug:
21641983
Bug:
22235775
Bug:
22299819
Bug:
22358164
Change-Id: I48a2d162dd499a3590f06d805267a63822856969
Svet Ganov [Tue, 14 Jul 2015 02:34:19 +0000 (19:34 -0700)]
Fix build
Change-Id: I2c97e405eaec7ee1569fcddc872ff2a98c829efe
Svet Ganov [Tue, 14 Jul 2015 01:32:17 +0000 (01:32 +0000)]
am
8cee6587: Merge "Teach storage appops." into mnc-dev
* commit '
8cee6587e0efb2d8e63f1505b057a1e328525017':
Teach storage appops.
Svet Ganov [Tue, 14 Jul 2015 01:24:34 +0000 (01:24 +0000)]
Merge "Teach storage appops." into mnc-dev
Svet Ganov [Fri, 10 Jul 2015 21:29:33 +0000 (14:29 -0700)]
Teach storage appops.
For modern apps targeting M SDK and up the external storage state
is deterined by granted permissions. For apps targeting older SDK
the storage access is determined by app ops correspning to the
storage permissions as the latter are always granted.
When app ops change we do not remount as we kill the app process
in both cases enabling and disabling an app op since legacy code
is not prepared for dynamic behavior where an operation that failed
may next succeed. Hence, we remount when we start the app.
For modern apps we don't kill the app process on a permission
grant, therefore we synchronously remount the app storage.
bug:
22104923
Change-Id: I601c19c764a74c2d15bea6630d0f5fdc52bf6a5a
Christopher Tate [Tue, 14 Jul 2015 01:18:40 +0000 (01:18 +0000)]
am
4b9b3e47: Merge "Default browser should not supersede intent filter priorities" into mnc-dev
* commit '
4b9b3e4731ffb962daf0f5029450001a8a6e7c00':
Default browser should not supersede intent filter priorities
Svet Ganov [Tue, 14 Jul 2015 01:12:15 +0000 (01:12 +0000)]
am
fc2bc7f1: Merge "Check signatures of privileged persistent apps for granting defailt permissions" into mnc-dev
* commit '
fc2bc7f170ba564bc439fd22dd5a779d96670ffd':
Check signatures of privileged persistent apps for granting defailt permissions
Christopher Tate [Tue, 14 Jul 2015 01:08:26 +0000 (01:08 +0000)]
Merge "Default browser should not supersede intent filter priorities" into mnc-dev
Christopher Tate [Tue, 14 Jul 2015 00:31:45 +0000 (17:31 -0700)]
Default browser should not supersede intent filter priorities
Bug
22304850
Change-Id: Ie4deffea2621fdc03a9bfe35690ecd109eed1a04
Christopher Tate [Tue, 14 Jul 2015 01:01:43 +0000 (01:01 +0000)]
am
288ecf98: Merge "Prioritize most-recently-enabled link-handling app" into mnc-dev
* commit '
288ecf98f14c9eff639b0a3de074d5b4a06eccec':
Prioritize most-recently-enabled link-handling app
Svetoslav [Tue, 14 Jul 2015 01:01:36 +0000 (01:01 +0000)]
am
56c59d15: Merge "Fix two grant default permissions edge cases." into mnc-dev
* commit '
56c59d1550703bc96151dc53bb4b697fda6a6028':
Fix two grant default permissions edge cases.
Robert Schaub [Tue, 14 Jul 2015 01:01:30 +0000 (01:01 +0000)]
am
9de5dcac: am
70d39c28: am
2b856100: Merge "docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page" into mnc-preview-docs
* commit '
9de5dcac9589d064414a2ff6f3b76dc40c1b8765':
docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page
Svet Ganov [Tue, 14 Jul 2015 00:58:32 +0000 (00:58 +0000)]
Merge "Check signatures of privileged persistent apps for granting defailt permissions" into mnc-dev
Christopher Tate [Tue, 14 Jul 2015 00:56:55 +0000 (00:56 +0000)]
Merge "Prioritize most-recently-enabled link-handling app" into mnc-dev
Svetoslav [Tue, 14 Jul 2015 00:54:34 +0000 (00:54 +0000)]
Merge "Fix two grant default permissions edge cases." into mnc-dev
Svetoslav [Tue, 14 Jul 2015 00:37:32 +0000 (17:37 -0700)]
Fix two grant default permissions edge cases.
1. When querying for components to which to grant default
permissions we are now getting disabled components as
well as we want such packages to get default pemrissions
on upgrade as disabled components may get reenabled.
2. When resolving activities to whose packages to grant default
permissions we skip the corss-profile and skip-profile filters
as they are set by device policy which should not affect
implicitly default permission grants. Policy has explicit
APIs for permission management.
bug:
22405963
Change-Id: Idf56d35e567a6fd6e097cd45988d1561422ee6fc
Robert Schaub [Tue, 14 Jul 2015 00:44:21 +0000 (00:44 +0000)]
am
70d39c28: am
2b856100: Merge "docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page" into mnc-preview-docs
* commit '
70d39c2836f3c05a93035439df0082b5c471c010':
docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page
Robert Schaub [Tue, 14 Jul 2015 00:26:21 +0000 (00:26 +0000)]
am
2b856100: Merge "docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page" into mnc-preview-docs
* commit '
2b856100f67da1505eac30e2d989b84a2d68f20a':
docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page
Jason Monk [Tue, 14 Jul 2015 00:15:22 +0000 (00:15 +0000)]
am
9c2182e1: Merge "Add a dumpsys for KeyguardUpdateMonitor" into mnc-dev
* commit '
9c2182e1b3d7a2eedb072d4ddcacb903e67b25aa':
Add a dumpsys for KeyguardUpdateMonitor
Robert Schaub [Tue, 14 Jul 2015 00:15:15 +0000 (00:15 +0000)]
am
fd186d20: am
28006a3b: am
7182f075: Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs
* commit '
fd186d20c53e8b0565f1360a71618710631eceeb':
docs: Changed text as requested in Android TV advertising bug, with minor cleanup
Robert Schaub [Tue, 14 Jul 2015 00:15:08 +0000 (00:15 +0000)]
am
0b403ebd: am
1962b730: am
3430bec7: Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs
* commit '
0b403ebd6aecdf6691c4df009c791096d734aeb0':
docs: Removed parenthetic phrase that made explanation unnecessarily confusing
David Friedman [Tue, 14 Jul 2015 00:15:01 +0000 (00:15 +0000)]
am
91a44578: am
5c3bf584: am
e0f0fabb: am
ccb8a9af: am
b510225e: Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs
* commit '
91a44578e4f1788cb97da79863faaa4ba7970f45':
docs: replacing command line tool instructions with Studio and Monitor steps
Eric Gilmore [Tue, 14 Jul 2015 00:14:54 +0000 (00:14 +0000)]
am
908c50a1: am
f13e914d: am
8cce3984: Merge "Adding a link to what is currently our most popular "100 Days" video." into mnc-preview-docs
* commit '
908c50a1727f546aa060b9fff1f2c648739acfee':
Adding a link to what is currently our most popular "100 Days" video.
Jinsuk Kim [Tue, 14 Jul 2015 00:14:48 +0000 (00:14 +0000)]
am
e249eb3a: Merge "Perform One touch play upon pressing home key" into mnc-dev
* commit '
e249eb3a6f33ee945113a8f11e8382e70c4e066f':
Perform One touch play upon pressing home key
Jason Monk [Tue, 14 Jul 2015 00:10:09 +0000 (00:10 +0000)]
Merge "Add a dumpsys for KeyguardUpdateMonitor" into mnc-dev
Christopher Tate [Sat, 11 Jul 2015 00:44:53 +0000 (17:44 -0700)]
Prioritize most-recently-enabled link-handling app
In the case when multiple apps handle a given web-link action,
all of which have been marked as "launch the app instead of a
browser" and so are otherwise ambiguous, always prefer the app
that was most recently placed into the always-handle-links state.
Bug
22051035
Change-Id: I3f43c19b0d7b74e9843445e41971bb5433affb1c
Robert Schaub [Mon, 13 Jul 2015 23:58:09 +0000 (23:58 +0000)]
am
28006a3b: am
7182f075: Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs
* commit '
28006a3b31d1cd3765568ceed211f8bc8de9c50c':
docs: Changed text as requested in Android TV advertising bug, with minor cleanup
Robert Schaub [Mon, 13 Jul 2015 23:58:03 +0000 (23:58 +0000)]
am
1962b730: am
3430bec7: Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs
* commit '
1962b730067d5b9ad9666ee3a7d1e3f90004c7d7':
docs: Removed parenthetic phrase that made explanation unnecessarily confusing
David Friedman [Mon, 13 Jul 2015 23:57:52 +0000 (23:57 +0000)]
am
5c3bf584: am
e0f0fabb: am
ccb8a9af: am
b510225e: Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs
* commit '
5c3bf5847c98b23a525288ed04f77b2a68ec6870':
docs: replacing command line tool instructions with Studio and Monitor steps
Eric Gilmore [Mon, 13 Jul 2015 23:57:43 +0000 (23:57 +0000)]
am
f13e914d: am
8cce3984: Merge "Adding a link to what is currently our most popular "100 Days" video." into mnc-preview-docs
* commit '
f13e914d23a47809d978183a8e6b6ab3a5d51098':
Adding a link to what is currently our most popular "100 Days" video.
Roshan Pius [Mon, 13 Jul 2015 23:56:07 +0000 (23:56 +0000)]
am
cf01fd0f: Merge "Catch & log security exception in telephonymanager" into mnc-dev
* commit '
cf01fd0f128a2d7fc5b9c0f9db4fc9e0e5552093':
Catch & log security exception in telephonymanager
Jinsuk Kim [Mon, 13 Jul 2015 23:44:58 +0000 (23:44 +0000)]
Merge "Perform One touch play upon pressing home key" into mnc-dev
Robert Schaub [Mon, 13 Jul 2015 23:41:11 +0000 (23:41 +0000)]
Merge "docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page" into mnc-preview-docs
Robert Schaub [Mon, 13 Jul 2015 23:23:48 +0000 (23:23 +0000)]
am
7182f075: Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs
* commit '
7182f075fad7865eb8c1ce58d90327addabc7c4b':
docs: Changed text as requested in Android TV advertising bug, with minor cleanup
Robert Schaub [Mon, 13 Jul 2015 23:23:43 +0000 (23:23 +0000)]
am
3430bec7: Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs
* commit '
3430bec7e0b2f7a0552a66a523e478cd2ecd9043':
docs: Removed parenthetic phrase that made explanation unnecessarily confusing
Robert Schaub [Mon, 29 Jun 2015 19:37:10 +0000 (12:37 -0700)]
docs: Removed references to lockscreen widgets, added note to Android 5.0
changes page
Removed one line from source code sample as well.
Bug:
20826638
Change-Id: I3c27353db0f0092c21962f9beec1bf1da52ee9d5
Roshan Pius [Mon, 13 Jul 2015 23:17:02 +0000 (23:17 +0000)]
Merge "Catch & log security exception in telephonymanager" into mnc-dev
Robert Schaub [Mon, 13 Jul 2015 23:12:22 +0000 (23:12 +0000)]
Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs
Robert Schaub [Mon, 13 Jul 2015 23:06:44 +0000 (23:06 +0000)]
Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs
Alex Klyubin [Mon, 13 Jul 2015 22:26:17 +0000 (15:26 -0700)]
Fix Android Keystore key factories to obey JCA contract.
Android Keystore provider's KeyFactory and SecretKeyFactory
implementations were throwing UnsupportedOperationException instead of
InvalidKeyException/InvalidKeySpecException from their
translateKey/generateKey methods.
Bug:
22459811
Change-Id: I6d5a5dc1bed724e858ad324d558b7480b9b848da
Amit Mahajan [Mon, 13 Jul 2015 22:21:40 +0000 (22:21 +0000)]
am
53e5ba22: Merge "Do not check runtime READ_PHONE_STATE if caller has the privileged one." into mnc-dev
* commit '
53e5ba22c1694fad23b67d18c42c01d6deada5f6':
Do not check runtime READ_PHONE_STATE if caller has the privileged one.
Amit Mahajan [Mon, 13 Jul 2015 22:06:03 +0000 (22:06 +0000)]
Merge "Do not check runtime READ_PHONE_STATE if caller has the privileged one." into mnc-dev
John Reck [Mon, 13 Jul 2015 22:03:58 +0000 (22:03 +0000)]
am
f96d9c54: Merge "Improve resource loading by ~3x" into mnc-dev
* commit '
f96d9c5421b7df1c60024a0928639e18c6d96b7b':
Improve resource loading by ~3x
John Reck [Mon, 13 Jul 2015 21:50:26 +0000 (21:50 +0000)]
Merge "Improve resource loading by ~3x" into mnc-dev
John Reck [Mon, 13 Jul 2015 21:42:43 +0000 (14:42 -0700)]
Improve resource loading by ~3x
Bug:
22392651
ColorStateLists were never cached because the lazy-create
of the constant state had a typo.
Resource caching in general was broken because ThemeKey did not
clone the hash code, so all keys in the cache had a hashCode
of 0 which did not match the real, uncloned ThemeKeys hash code
so the binary search in ArrayMap based off of hash code was failing.
Change-Id: I9df1628b226bfa797bed97875354c19bf64f41ad
Jason Monk [Mon, 13 Jul 2015 21:02:49 +0000 (17:02 -0400)]
Add a dumpsys for KeyguardUpdateMonitor
Include the info used when determining carrier text display.
Bug:
22212693
Change-Id: I12f01683c259ff11c7f27eec5d03d53f0b290d0b
Wale Ogunwale [Mon, 13 Jul 2015 20:58:45 +0000 (20:58 +0000)]
am
093d8de2: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev
* commit '
093d8de298c258943ca79c1cf429f5ef5725d1bb':
Finish already paused activity if it should be finished after pausing
Wale Ogunwale [Mon, 13 Jul 2015 20:49:05 +0000 (20:49 +0000)]
Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev
Chris Craik [Mon, 13 Jul 2015 20:34:07 +0000 (13:34 -0700)]
Fix unsafety in SkiaShader storage, and texture unit accounting
bug:
22390304
Fixes two issues:
1) The max texture unit wasn't large enough to handle the most complex
ComposeShader case (1 for draw primitive, 2 for gradient shader, 1 for
bitmap shader).
2) If a shader isn't supported by SkiaShader::store, the shader data
needs to be explicitly disabled, so we won't read uninitilized data
from it when trying to read shader information out.
Change-Id: I29ee7b7c1e07f67db88c1707bdc857daa305e713
Roshan Pius [Thu, 9 Jul 2015 21:15:25 +0000 (14:15 -0700)]
Catch & log security exception in telephonymanager
BUG:
22225068
Change-Id: I9b0053cf1041c81f409ace556b810ef79de88599
Vinit Deshpande [Mon, 13 Jul 2015 20:00:21 +0000 (20:00 +0000)]
am
0bd08fc2: Merge "Fix multiple SSIDs for same Passpoint issues" into mnc-dev
* commit '
0bd08fc22ae457791d95a4d557051e6601516bd0':
Fix multiple SSIDs for same Passpoint issues
Vinit Deshpande [Mon, 13 Jul 2015 19:46:25 +0000 (19:46 +0000)]
Merge "Fix multiple SSIDs for same Passpoint issues" into mnc-dev
Jim Miller [Mon, 13 Jul 2015 18:49:23 +0000 (18:49 +0000)]
am
16c1764c: Merge "Change MANAGE_FINGERPRINT permission to system|signature" into mnc-dev
* commit '
16c1764cf552432d304eaefd912d5aebe3192449':
Change MANAGE_FINGERPRINT permission to system|signature
Jim Miller [Mon, 13 Jul 2015 18:41:29 +0000 (18:41 +0000)]
Merge "Change MANAGE_FINGERPRINT permission to system|signature" into mnc-dev
Aravind Akella [Mon, 13 Jul 2015 18:35:12 +0000 (18:35 +0000)]
am
37511e35: Merge "Log full class name of the client activating sensors for better debugging." into mnc-dev
* commit '
37511e35ae22ea88539f1137ea2f74c9cb17f60c':
Log full class name of the client activating sensors for better debugging.
Aravind Akella [Mon, 13 Jul 2015 18:21:34 +0000 (18:21 +0000)]
Merge "Log full class name of the client activating sensors for better debugging." into mnc-dev
Etan Cohen [Mon, 13 Jul 2015 18:16:39 +0000 (18:16 +0000)]
am
c09544bb: Merge "Fix filter on CONNECTIVITY_ACTION updates" into mnc-dev
* commit '
c09544bb88ada53494d4a955d0450a22985b4799':
Fix filter on CONNECTIVITY_ACTION updates
Amith Yamasani [Mon, 13 Jul 2015 18:16:32 +0000 (18:16 +0000)]
am
1578357d: Merge "Check user state after clearing identity." into mnc-dev
* commit '
1578357df737296aa151c6934fe7dd749a43ae15':
Check user state after clearing identity.
Etan Cohen [Mon, 13 Jul 2015 18:04:38 +0000 (18:04 +0000)]
Merge "Fix filter on CONNECTIVITY_ACTION updates" into mnc-dev
Amith Yamasani [Mon, 13 Jul 2015 18:03:18 +0000 (18:03 +0000)]
Merge "Check user state after clearing identity." into mnc-dev
Chris Wren [Mon, 13 Jul 2015 17:53:08 +0000 (17:53 +0000)]
am
208934ff: Merge "fix build by restoring deleted enum" into mnc-dev
* commit '
208934ff010cc2aff7d8fee9237d6cee0e5bb563':
fix build by restoring deleted enum
Julia Reynolds [Mon, 13 Jul 2015 17:43:59 +0000 (17:43 +0000)]
am
fbd0a444: Merge "Remove personal/device group from sideloading screen." into mnc-dev
* commit '
fbd0a444e787c93ee8ef8741fcf24826a8619fcb':
Remove personal/device group from sideloading screen.
Chris Wren [Mon, 13 Jul 2015 17:41:48 +0000 (17:41 +0000)]
Merge "fix build by restoring deleted enum" into mnc-dev
Julia Reynolds [Mon, 13 Jul 2015 17:34:10 +0000 (17:34 +0000)]
Merge "Remove personal/device group from sideloading screen." into mnc-dev
Chris Wren [Mon, 13 Jul 2015 16:59:01 +0000 (12:59 -0400)]
fix build by restoring deleted enum
Bug:
21114836
Change-Id: Ied4a6e48c66f882f43343a21bce0b3ccccd81713
Jason Monk [Mon, 13 Jul 2015 16:32:32 +0000 (16:32 +0000)]
am
28a07ff0: Merge "Fix demo mode issues" into mnc-dev
* commit '
28a07ff0e1bf6029653ceaaa7bbfae0080ee05d7':
Fix demo mode issues
Chris Wren [Mon, 13 Jul 2015 16:32:25 +0000 (16:32 +0000)]
am
4502bfb8: Merge "add new enums to MetricsConstans" into mnc-dev
* commit '
4502bfb8fd5ddb15bf0cc9bfc631eda269621f29':
add new enums to MetricsConstans
Jason Monk [Mon, 13 Jul 2015 16:32:19 +0000 (16:32 +0000)]
am
59b1dfef: Merge "Show volume restriction toast on all users" into mnc-dev
* commit '
59b1dfef62a041920f36c8e3e376d38facdd9c8d':
Show volume restriction toast on all users
Jason Monk [Mon, 13 Jul 2015 16:22:35 +0000 (16:22 +0000)]
Merge "Fix demo mode issues" into mnc-dev