OSDN Git Service
Billy Lau [Fri, 7 Aug 2015 22:22:18 +0000 (22:22 +0000)]
am
70f998e5: Merge "Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
* commit '
70f998e57df2b3ed79331669a93a0ba314f25e7d':
Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
Billy Lau [Fri, 7 Aug 2015 22:16:03 +0000 (22:16 +0000)]
Merge "Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
Dianne Hackborn [Fri, 7 Aug 2015 22:06:31 +0000 (22:06 +0000)]
am
f0e5501e: Merge "Fix issue #
22989030: Separate battery whitelists" into mnc-dev
* commit '
f0e5501e093c688cd293308e0aafc2b55326c255':
Fix issue #
22989030: Separate battery whitelists
Dianne Hackborn [Fri, 7 Aug 2015 21:58:38 +0000 (21:58 +0000)]
Merge "Fix issue #
22989030: Separate battery whitelists" into mnc-dev
Matthew Williams [Fri, 7 Aug 2015 21:31:28 +0000 (21:31 +0000)]
am
9d929558: Merge "Correctly skip files that are excluded from restore" into mnc-dev
* commit '
9d92955894118a51e310fdfeeb09f5b1d187c37f':
Correctly skip files that are excluded from restore
Matthew Williams [Fri, 7 Aug 2015 21:25:31 +0000 (21:25 +0000)]
Merge "Correctly skip files that are excluded from restore" into mnc-dev
Dianne Hackborn [Fri, 7 Aug 2015 05:19:06 +0000 (22:19 -0700)]
Fix issue #
22989030: Separate battery whitelists
We now have a new whitelist you can put apps in, which
opts them out of the old battery saver mode and new app idle,
but doesn't keep them from going in to doze. This is for a few
special cases that we had previously whitelisted for battery saver,
and inherited to the new modes... ultimately we should figure out
how to get these apps out of the whitelist completely, but this
will help for now.
Apps in this new whitelist are not shown in the UI, because they
are still significantly restricted by not being able to operate
normally in doze. This also means they are still visible in the
list of all apps for the user to be able to put them on/off the
complete whitelist if that is what they really want.
In the course of doing this, I needed to clean up code in the
network policy manager to better separate management of the
two firewall rules that now have different whitelists applied
to them. This also hopefully just generally simplifies and cleans
up that code. Hopefully!
Change-Id: I92e15f2f85899571dd8b049b5e3eb1354f55f353
Neil Fuller [Fri, 7 Aug 2015 21:16:51 +0000 (21:16 +0000)]
am
14b884c1: am
daf8d905: Merge "Add ICU as a java library for docs."
* commit '
14b884c16ecf3a70999fcbd1862f6f1b38b24367':
Add ICU as a java library for docs.
Shirish Kalele [Fri, 7 Aug 2015 20:30:38 +0000 (20:30 +0000)]
am
027e3b7f: Merge "Fix check for caller being the active network scorer" into mnc-dev
* commit '
027e3b7f51cd172dae89f69cc358363b0cf20f5f':
Fix check for caller being the active network scorer
Shirish Kalele [Fri, 7 Aug 2015 20:25:06 +0000 (20:25 +0000)]
Merge "Fix check for caller being the active network scorer" into mnc-dev
Nicolas Prévot [Fri, 7 Aug 2015 19:33:23 +0000 (19:33 +0000)]
am
288e82f8: Merge "Keep intent verification status of system apps when uninstalling them." into mnc-dev
* commit '
288e82f8f67db894c43bf4ea659ca832f979c65a':
Keep intent verification status of system apps when uninstalling them.
Julia Reynolds [Fri, 7 Aug 2015 19:24:45 +0000 (19:24 +0000)]
am
9dc4d50b: Merge "Update Navigation bar assets." into mnc-dev
* commit '
9dc4d50be1db82359050fd082828680bde44b9fd':
Update Navigation bar assets.
Nicolas Prévot [Fri, 7 Aug 2015 19:23:52 +0000 (19:23 +0000)]
Merge "Keep intent verification status of system apps when uninstalling them." into mnc-dev
Julia Reynolds [Fri, 7 Aug 2015 19:19:02 +0000 (19:19 +0000)]
Merge "Update Navigation bar assets." into mnc-dev
Jason Monk [Fri, 7 Aug 2015 18:47:06 +0000 (18:47 +0000)]
am
69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev
* commit '
69ed33087d77e32a1f1475adf00b9d87580960aa':
Allow system to disable lockscreen
Jason Monk [Fri, 7 Aug 2015 18:40:19 +0000 (18:40 +0000)]
Merge "Allow system to disable lockscreen" into mnc-dev
Billy Lau [Sat, 1 Aug 2015 11:45:02 +0000 (12:45 +0100)]
Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS
Merge the CHANGE_NETWORK_STATE permission with WRITE_SETTINGS.
AndroidManifest.xml:
Raised the protection level of CHANGE_NETWORK_STATE permission from
normal to signature|appops and pre23|preinstall for compatibility
provider/Settings:
Wrote new helper methods to check if app is allowed to change network
state.
ConnectivityManager.java & ConnectivityService.java:
Replace enforcement checks for CHANGE_NETWORK_STATE with
checkAndNoteChangeNetworkStateOperations instead.
Change-Id: If8c2dd3c76a5324ca43f1d90fa17973216c2bcc5
Amith Yamasani [Fri, 7 Aug 2015 18:28:09 +0000 (18:28 +0000)]
am
1fbc1b3b: Merge "Fix partial user cleanup on restart" into mnc-dev
* commit '
1fbc1b3b4b742cdba25d32d65a9813933a37005f':
Fix partial user cleanup on restart
Amith Yamasani [Fri, 7 Aug 2015 18:21:30 +0000 (18:21 +0000)]
Merge "Fix partial user cleanup on restart" into mnc-dev
Chris Tate [Fri, 7 Aug 2015 18:20:36 +0000 (18:20 +0000)]
am
c376afb4: Merge "Wait a bit longer for wifi to shut down before rewriting the config" into mnc-dev
* commit '
c376afb472d1d4f0fba4a03ac4cf05b498866d64':
Wait a bit longer for wifi to shut down before rewriting the config
Dianne Hackborn [Fri, 7 Aug 2015 18:16:13 +0000 (18:16 +0000)]
am
3d06ea03: Merge "Debugging for issue #
22556778: Starting under voice control not allowed" into mnc-dev
* commit '
3d06ea0349d6afb4248ab47151424bf64cdf5a2d':
Debugging for issue #
22556778: Starting under voice control not allowed
Chris Tate [Fri, 7 Aug 2015 18:15:19 +0000 (18:15 +0000)]
Merge "Wait a bit longer for wifi to shut down before rewriting the config" into mnc-dev
Nicolas Prevot [Fri, 7 Aug 2015 18:11:25 +0000 (19:11 +0100)]
Keep intent verification status of system apps when uninstalling them.
When creating a work profile, system apps are uninstalled and then
sometimes reinstalled.
In the process, they lose their intent verification status.
BUG:
22943461
Change-Id:I5b008c6de2125f190063b08908076a649067c60d
Amith Yamasani [Fri, 7 Aug 2015 18:09:05 +0000 (11:09 -0700)]
Fix partial user cleanup on restart
Internal volume was not available during PackageManagerService creation,
which resulted in a zombie user's folder not being cleaned after a reboot.
Add the internal volume earlier in the boot cycle so that it can be accessed
for user cleanup.
Bug:
22483086
Change-Id: I8f3ffbb25f3902d00a96d1ee2d7a79373c5e35b7
Dianne Hackborn [Fri, 7 Aug 2015 18:06:01 +0000 (18:06 +0000)]
Merge "Debugging for issue #
22556778: Starting under voice control not allowed" into mnc-dev
Julia Reynolds [Fri, 7 Aug 2015 17:56:08 +0000 (13:56 -0400)]
Update Navigation bar assets.
Bug:
22855920
Change-Id: I2d66bb087b092cdb6280e78c064f32ae9e42ad61
Christopher Tate [Fri, 7 Aug 2015 17:57:01 +0000 (10:57 -0700)]
Wait a bit longer for wifi to shut down before rewriting the config
We've seen case of it taking longer than 1500ms for the wifi system to
actually shut down after the triggering settings element is written,
so extend the wait time a bit. We've seen it take more than 1500ms
but not more than 2500ms, so that's the new heuristic.
This will of course all become happily obsolete once we start
applying restored AP definitions programmatically rather than by
filesystem-level operations.
Bug
22979342
Change-Id: I6acf1baac23d4100124093128b82abf242b11a0e
Dianne Hackborn [Fri, 7 Aug 2015 17:37:21 +0000 (10:37 -0700)]
Debugging for issue #
22556778: Starting under voice control not allowed
Better error messages in log to explain what is going on.
Change-Id: Ie686a323ceedd42453b6581fe79653b407d49ee5
Dianne Hackborn [Fri, 7 Aug 2015 17:26:11 +0000 (17:26 +0000)]
am
53d6cddb: Merge "Fix issue #
22846750: Starting Screenie Now On Tap crashes USA Today" into mnc-dev
* commit '
53d6cddb4137c7b5648fc069adcc0cf6c501a6c4':
Fix issue #
22846750: Starting Screenie Now On Tap crashes USA Today
Dianne Hackborn [Fri, 7 Aug 2015 17:18:11 +0000 (17:18 +0000)]
Merge "Fix issue #
22846750: Starting Screenie Now On Tap crashes USA Today" into mnc-dev
Michael Wright [Fri, 7 Aug 2015 16:57:44 +0000 (16:57 +0000)]
am
d7255cfb: Merge "DO NOT MERGE. Add new media navigation keys." into mnc-dev
* commit '
d7255cfb1cf8dc7249632d93d68daac8cc2c7b9c':
DO NOT MERGE. Add new media navigation keys.
Michael Wright [Fri, 7 Aug 2015 16:52:27 +0000 (16:52 +0000)]
Merge "DO NOT MERGE. Add new media navigation keys." into mnc-dev
Svetoslav Ganov [Fri, 7 Aug 2015 15:33:57 +0000 (15:33 +0000)]
am
38d30dc5: Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev
* commit '
38d30dc547825bdde2756f588692063a28749e8d':
Immediately kill a shared user process on a permission revocation.
Svetoslav Ganov [Fri, 7 Aug 2015 15:27:49 +0000 (15:27 +0000)]
Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev
Neil Fuller [Fri, 7 Aug 2015 14:57:49 +0000 (14:57 +0000)]
am
daf8d905: Merge "Add ICU as a java library for docs."
* commit '
daf8d9056815b7435bdf4d07da3f938f11052691':
Add ICU as a java library for docs.
Neil Fuller [Fri, 7 Aug 2015 14:46:06 +0000 (14:46 +0000)]
Merge "Add ICU as a java library for docs."
Jason Monk [Fri, 7 Aug 2015 14:44:12 +0000 (14:44 +0000)]
am
77566dd1: Merge "Use BluetoothController for status bar icon status" into mnc-dev
* commit '
77566dd1e15353eb062503767c6e4a354303fd09':
Use BluetoothController for status bar icon status
Jason Monk [Fri, 7 Aug 2015 14:38:29 +0000 (14:38 +0000)]
Merge "Use BluetoothController for status bar icon status" into mnc-dev
Michael Wright [Thu, 6 Aug 2015 14:16:22 +0000 (15:16 +0100)]
DO NOT MERGE. Add new media navigation keys.
Bug:
22059484
Change-Id: Ifd8fd18178fed45ead2980b957dd1d177e40f165
Jason Monk [Thu, 6 Aug 2015 18:49:36 +0000 (14:49 -0400)]
Allow system to disable lockscreen
Even when there is a pin.
Bug:
22920549
Change-Id: Ib84e1c3ac67be0318d4186c66ee582a49969e373
Dianne Hackborn [Thu, 6 Aug 2015 01:07:31 +0000 (18:07 -0700)]
Fix issue #
22846750: Starting Screenie Now On Tap crashes USA Today
Try to deal well with badly behaving old apps.
Change-Id: Ibc41e5867869463fbf91f3e411c69677909fedad
Svetoslav [Thu, 6 Aug 2015 22:03:55 +0000 (15:03 -0700)]
Immediately kill a shared user process on a permission revocation.
1. When a permission is revoked we kill the app immediately but do
not do an immediate kill for shared uid processes. This fixes it.
2. Remove system APIs that are used only by the package installer.
bug:
22984670
Change-Id: I3d4ae52ea8679f894aa7c5972941263903479183
Jeff Davidson [Fri, 7 Aug 2015 01:44:16 +0000 (01:44 +0000)]
am
1d7c3254: Merge "Correctly propagate permissions when uninstalling updates." into mnc-dev
* commit '
1d7c32548c30c62a35c54a624f89d5f9db31b9d4':
Correctly propagate permissions when uninstalling updates.
Jeff Davidson [Fri, 7 Aug 2015 01:39:14 +0000 (01:39 +0000)]
Merge "Correctly propagate permissions when uninstalling updates." into mnc-dev
Wale Ogunwale [Fri, 7 Aug 2015 01:14:14 +0000 (01:14 +0000)]
am
a0ef49c4: Look for recent tasks in live stacks.
* commit '
a0ef49c44f7d845e3465591ea977d0c9996c4e5e':
Look for recent tasks in live stacks.
Wale Ogunwale [Fri, 7 Aug 2015 00:16:02 +0000 (17:16 -0700)]
Look for recent tasks in live stacks.
It is possible for a tasks not to have been saved to the
persisted recent list yet for various reasons. This causes
some external calls to fail when they are trying to do
an operation on a task with a given id. We now use the
stack supervisor look-up for a task id that checks
everywhere a task might be including live stack. It this
fails then the task truly doesn't exist.
Bug:
22924782
Change-Id: I57c3df41d0b4f3ee3c5ae9b7d01eeb2b352062b4
Deepanshu Gupta [Thu, 6 Aug 2015 23:33:43 +0000 (23:33 +0000)]
am
8f26616d: Merge "LayoutLib: Switch SimpleDateFormat to icu." into mnc-dev
* commit '
8f26616d1a1765267d6a3ba09e7ac1bd6edeca67':
LayoutLib: Switch SimpleDateFormat to icu.
Deepanshu Gupta [Thu, 6 Aug 2015 23:26:01 +0000 (23:26 +0000)]
Merge "LayoutLib: Switch SimpleDateFormat to icu." into mnc-dev
Deepanshu Gupta [Thu, 6 Aug 2015 23:15:59 +0000 (23:15 +0000)]
am
385ce0a3: Merge "Replace Locale.getDefault with custom impl." into mnc-dev
* commit '
385ce0a31dbdd4b4b1865755dbc4af157f72481c':
Replace Locale.getDefault with custom impl.
Deepanshu Gupta [Thu, 6 Aug 2015 23:08:46 +0000 (23:08 +0000)]
Merge "Replace Locale.getDefault with custom impl." into mnc-dev
Deepanshu Gupta [Thu, 6 Aug 2015 22:32:44 +0000 (15:32 -0700)]
LayoutLib: Switch SimpleDateFormat to icu.
Use ICU's implementation of SimpleDateFormat in LayoutLib. The format
patterns used are not supported by java.text.SimpleDateFormat.
The change required adding a mechanism for promoting visibility of
fields in the framework in the create tool.
TODO: Add additional tests in the create tool for this new
functionality.
Change-Id: Id0f4be41f9731c42a28919c32cc5ef271a656982
Deepanshu Gupta [Tue, 4 Aug 2015 23:17:46 +0000 (16:17 -0700)]
Replace Locale.getDefault with custom impl.
In LayoutLib the default locale should always be the locale set the
rendering params. This change replaces all calls to Locale.getDefault in
the framework with calls to AndroidLocale.getDefault() which tries to
find the locale from the current context, but falls back to the original
call.
Change-Id: I496b35dcfc17fd61fedee21c7495541ab870b1fc
Andres Morales [Thu, 6 Aug 2015 22:31:04 +0000 (22:31 +0000)]
am
85c73c40: Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev
* commit '
85c73c40d1fd76e8a7bbd90ab80458082764c1c3':
[UserManager] expose method to retrieve credential owner
Andres Morales [Thu, 6 Aug 2015 22:22:17 +0000 (22:22 +0000)]
Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev
Winson Chung [Thu, 6 Aug 2015 21:52:19 +0000 (21:52 +0000)]
am
bb55aa1a: Merge "Fixing issue with empty Recents screen." into mnc-dev
* commit '
bb55aa1a93cee91a40b6f5941675682cb6f8a83b':
Fixing issue with empty Recents screen.
Winson Chung [Thu, 6 Aug 2015 21:44:17 +0000 (21:44 +0000)]
Merge "Fixing issue with empty Recents screen." into mnc-dev
Wei Jia [Thu, 6 Aug 2015 21:37:49 +0000 (21:37 +0000)]
am
a89e9f6d: Merge "MediaSync: fix API comments." into mnc-dev
* commit '
a89e9f6d3207527888d7fab191ddbe92ff68fc79':
MediaSync: fix API comments.
Wei Jia [Thu, 6 Aug 2015 21:31:22 +0000 (21:31 +0000)]
Merge "MediaSync: fix API comments." into mnc-dev
Jason Monk [Thu, 6 Aug 2015 20:32:18 +0000 (16:32 -0400)]
Use BluetoothController for status bar icon status
Bug:
22819904
Change-Id: I6ca11c57431f8e930a47144090158363175a3b99
Jeff Sharkey [Thu, 6 Aug 2015 19:58:04 +0000 (19:58 +0000)]
am
cb54ffb2: Merge "Protect runtime storage mount points." into mnc-dev
* commit '
cb54ffb2cb9583eaf6b58dcc636681c4e4e07a7d':
Protect runtime storage mount points.
Shirish Kalele [Thu, 6 Aug 2015 19:34:22 +0000 (12:34 -0700)]
Fix check for caller being the active network scorer
Compare caller and scorer uids to decide if caller is the
active scorer instead of calling AppOps.checkPackage().
Bug:
23000690
Change-Id: I64285f965716f3aceb24f193d86ab9d6be7202c5
Wei Jia [Thu, 6 Aug 2015 18:04:22 +0000 (11:04 -0700)]
MediaSync: fix API comments.
Bug:
23008551
Change-Id: Ifbf1970c174b54a761d4672d954ee5633adbf3d6
Winson [Thu, 6 Aug 2015 19:51:26 +0000 (12:51 -0700)]
Fixing issue with empty Recents screen.
- We did not expect RecentsActivity to be launched without going through
the normal SystemUI controls, but when the home activity is in the foreground
and killed (via a normal apk update), the RecentsActivity stores the old
launch configuration and believes that it was launched from home and awaits
the animation-complete callback to animate the tasks in.
- This CL adds a workaround where the configuration is reset whenever
RecentsActivity is stopped, which allows the tasks to be shown immediately
if the User is kicked back into Recents due to an update.
Bug:
22542869
Change-Id: I2b4168ccecfbf868fa6d544fe89109dfa74f51df
Jeff Sharkey [Thu, 6 Aug 2015 19:27:42 +0000 (19:27 +0000)]
Merge "Protect runtime storage mount points." into mnc-dev
Chris Wren [Thu, 6 Aug 2015 19:25:28 +0000 (19:25 +0000)]
am
93f3fc87: Merge "add metrics to assistant" into mnc-dev
* commit '
93f3fc876639cd23ff176cba2e1f8f08df6f3fb5':
add metrics to assistant
Benjamin Franz [Thu, 6 Aug 2015 19:21:07 +0000 (19:21 +0000)]
am
339a9bbf: Merge "Use realActivity as indicator for task locking" into mnc-dev
* commit '
339a9bbf6d6544b516d6dbbae874d02f3ef7a6a4':
Use realActivity as indicator for task locking
Chris Wren [Thu, 6 Aug 2015 19:18:17 +0000 (19:18 +0000)]
Merge "add metrics to assistant" into mnc-dev
Benjamin Franz [Thu, 6 Aug 2015 19:15:29 +0000 (19:15 +0000)]
Merge "Use realActivity as indicator for task locking" into mnc-dev
Svetoslav Ganov [Thu, 6 Aug 2015 19:12:59 +0000 (19:12 +0000)]
am
38c0fbda: Merge "Pregrant unrevokable storage permission to the CertInstaller" into mnc-dev
* commit '
38c0fbda53399ac888e112d235e217fea220c2b7':
Pregrant unrevokable storage permission to the CertInstaller
Chris Wren [Thu, 6 Aug 2015 18:53:32 +0000 (14:53 -0400)]
add metrics to assistant
long press
screenshot enabled
context enabled
Bug:
22949579
Change-Id: Iac178207fa7149cda03c9a817a0d1450e46e1c59
Svetoslav Ganov [Thu, 6 Aug 2015 19:08:33 +0000 (19:08 +0000)]
Merge "Pregrant unrevokable storage permission to the CertInstaller" into mnc-dev
Paul Mclean [Thu, 6 Aug 2015 19:06:18 +0000 (19:06 +0000)]
am
af7748ef: Merge "Consider channel index masks when calculating channel counts." into mnc-dev
* commit '
af7748efb6cf4ecca07ab7a76b678a04387e2e40':
Consider channel index masks when calculating channel counts.
Paul Mclean [Thu, 6 Aug 2015 19:06:11 +0000 (19:06 +0000)]
am
c770b7a5: Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into mnc-dev
* commit '
c770b7a537350930dab6489c1e2a6f7e46dc47d1':
Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test.
Paul Mclean [Thu, 6 Aug 2015 18:59:06 +0000 (18:59 +0000)]
Merge "Consider channel index masks when calculating channel counts." into mnc-dev
Paul Mclean [Thu, 6 Aug 2015 18:58:33 +0000 (18:58 +0000)]
Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into mnc-dev
Jeff Sharkey [Thu, 6 Aug 2015 18:40:21 +0000 (11:40 -0700)]
Protect runtime storage mount points.
We have a bunch of magic that mounts the correct view of storage
access based on the runtime permissions of an app, but we forgot to
protect the real underlying data sources; oops.
This series of changes just bumps the directory heirarchy one level
to give us /mnt/runtime which we can mask off as 0700 to prevent
people from jumping to the exposed internals.
Also add CTS tests to verify that we're protecting access to
internal mount points like this.
Bug:
22964288
Change-Id: I74dbdcb01d4fabe92166b8043a74c6a1e93c6d5f
Alan Viverette [Thu, 6 Aug 2015 17:55:02 +0000 (17:55 +0000)]
am
c7f8133f: Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev
* commit '
c7f8133fa1ff78fea5a54974b5987791cb012f84':
Update anchor background on the correct view in PopupWindow
Alan Viverette [Thu, 6 Aug 2015 17:48:22 +0000 (17:48 +0000)]
Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev
Matthew Williams [Thu, 6 Aug 2015 01:27:44 +0000 (18:27 -0700)]
Correctly skip files that are excluded from restore
BUG:
22957980
If a file was present in the backup but excluded on restore,
it can result in the restored data being corrupted.
Ensure that FullBackup.restoreFile is called with a
null destination, which will result in the file not
being written to disk, but still properly pulled
from the socket.
Change-Id: Iac882a961b76e687654535aec352678486a08c39
Benjamin Franz [Thu, 6 Aug 2015 17:09:03 +0000 (18:09 +0100)]
Use realActivity as indicator for task locking
When lock task mode is started, we verify that the package is
whitelisted and currently use mCallingPackage as indicator. However,
the calling package is not necessarily identical to the package trying
to lock itself, so lock task mode sometimes fails. Switching over to
using realActivity as package marker.
Bug:
22916291
Change-Id: Ifd4df2d634842c8106b0b0f690bcf1faba0ed5fa
Dianne Hackborn [Thu, 6 Aug 2015 16:55:05 +0000 (16:55 +0000)]
am
6b0f1e78: Merge "Fix issue #
22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev
* commit '
6b0f1e78b841a32b45f513d283202e3af90c6a73':
Fix issue #
22843150: fragment transaction crash from onRequestPermisssionResult
Dianne Hackborn [Thu, 6 Aug 2015 16:48:34 +0000 (16:48 +0000)]
Merge "Fix issue #
22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev
Alan Viverette [Thu, 6 Aug 2015 16:36:47 +0000 (12:36 -0400)]
Update anchor background on the correct view in PopupWindow
We were always setting the background of the decor view when the
"above anchor" state changed, rather than the background view.
Bug:
22970244
Change-Id: I3cd7202767ee47cb415736bb3c07369801abccd8
Chet Haase [Thu, 6 Aug 2015 16:29:00 +0000 (16:29 +0000)]
am
da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev
* commit '
da493aa6eab24de98b63cc63c457f5b899da3ad2':
Avoid changing internal state of shared drawable
Chet Haase [Thu, 6 Aug 2015 16:23:20 +0000 (16:23 +0000)]
Merge "Avoid changing internal state of shared drawable" into mnc-dev
Paul McLean [Thu, 6 Aug 2015 15:35:55 +0000 (09:35 -0600)]
Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test.
Bug:
22792346
Change-Id: I8a10eb68368ede4baa0d2fd0d71cfff2fced4b75
Alan Treadway [Thu, 6 Aug 2015 15:52:38 +0000 (15:52 +0000)]
am
190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev
* commit '
190a88d2ce6a08d0eb98d774b81e5ca6b82b45f8':
Update documentation of DevicePolicyManager intents.
Alan Treadway [Thu, 6 Aug 2015 15:47:34 +0000 (15:47 +0000)]
Merge "Update documentation of DevicePolicyManager intents." into mnc-dev
Alan Treadway [Tue, 28 Jul 2015 10:49:35 +0000 (11:49 +0100)]
Update documentation of DevicePolicyManager intents.
Add additional information about the intentions of result codes in
device-owner and profile-owner launch intents, in alignment with
changes made in http://ag/732321.
Bug:
21063241
Change-Id: I0e0a931739cee5f46e8fc7622fe1de49e26dcb0a
Chet Haase [Thu, 6 Aug 2015 04:44:42 +0000 (21:44 -0700)]
Avoid changing internal state of shared drawable
An optimization in ImageView nulled out the internal bitmap of a cached
internal BitmapDrawable object created to wrap a bitmap set on the ImageView.
However, apps can get ahold of that cached object via Drawable.getBitmap(),
resulting in having the state of that object they may be using changing out
from under them.
The change is to null out the cached object when getDrawable() is called, to avoid
leaking internal state that we may change.
That way, the app can continue to use that object if they want to, but we are no longer
relying on it internally, and will create a new one when needed.
Issue #
22930646 [1P Regression from L] ImageView is blanked out in Activity in Google Express
Change-Id: Ic86cb93be4897b6ba247c1fabcda507e4ba01300
Michael Wright [Thu, 6 Aug 2015 13:59:40 +0000 (13:59 +0000)]
am
d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev
* commit '
d5a6df6d228036258d616245502c1a4f85ba4b2e':
Make the NullVibrator really null.
Michael Wright [Thu, 6 Aug 2015 13:59:32 +0000 (13:59 +0000)]
am
eb7e3d7e: Merge "Don\'t dispatch when non-interactive and the display is off." into mnc-dev
* commit '
eb7e3d7e456177f7848834759b9a7f6f78a05f7a':
Don't dispatch when non-interactive and the display is off.
Michael Wright [Thu, 6 Aug 2015 13:52:34 +0000 (13:52 +0000)]
Merge "Make the NullVibrator really null." into mnc-dev
Michael Wright [Thu, 6 Aug 2015 13:50:37 +0000 (13:50 +0000)]
Merge "Don't dispatch when non-interactive and the display is off." into mnc-dev
Julia Reynolds [Thu, 6 Aug 2015 13:48:36 +0000 (13:48 +0000)]
am
a3b5a612: Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev
* commit '
a3b5a61271bde79ef1072b13ed14525ce53bf62b':
Store ringer mode on entering DND mode so it can be restored on exit.
Julia Reynolds [Thu, 6 Aug 2015 13:41:01 +0000 (13:41 +0000)]
Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev
Geoff Mendal [Thu, 6 Aug 2015 04:20:12 +0000 (04:20 +0000)]
am
375c792c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
375c792c176be43720da47db2cfced23613f537c':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:12:38 +0000 (04:12 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Mitchell Wills [Thu, 6 Aug 2015 02:30:36 +0000 (02:30 +0000)]
am
d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev
* commit '
d14c48444a40fa2f964461e2f1317bcc3e256295':
Pass connection configuration when setting wifi info
Mitchell Wills [Thu, 6 Aug 2015 02:23:44 +0000 (02:23 +0000)]
Merge "Pass connection configuration when setting wifi info" into mnc-dev