198012 Commits

Author SHA1 Message Date
Dianne Hackborn
4a503b1ece 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
2015-08-07 14:23:32 -07:00
Jeff Davidson
1d7c32548c Merge "Correctly propagate permissions when uninstalling updates." into mnc-dev 2015-08-07 01:39:14 +00:00
Wale Ogunwale
a0ef49c44f 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
2015-08-07 00:26:01 +00:00
Deepanshu Gupta
8f26616d1a Merge "LayoutLib: Switch SimpleDateFormat to icu." into mnc-dev 2015-08-06 23:26:01 +00:00
Deepanshu Gupta
385ce0a31d Merge "Replace Locale.getDefault with custom impl." into mnc-dev 2015-08-06 23:08:46 +00:00
Deepanshu Gupta
b556decf75 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
2015-08-06 16:04:04 -07:00
Deepanshu Gupta
82c7fdb1f6 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
2015-08-06 16:03:19 -07:00
Andres Morales
85c73c40d1 Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev 2015-08-06 22:22:17 +00:00
Winson Chung
bb55aa1a93 Merge "Fixing issue with empty Recents screen." into mnc-dev 2015-08-06 21:44:17 +00:00
Wei Jia
a89e9f6d32 Merge "MediaSync: fix API comments." into mnc-dev 2015-08-06 21:31:22 +00:00
Wei Jia
5d177fff2f MediaSync: fix API comments.
Bug: 23008551

Change-Id: Ifbf1970c174b54a761d4672d954ee5633adbf3d6
2015-08-06 12:51:36 -07:00
Winson
76ffdafc3c 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
2015-08-06 12:51:26 -07:00
Jeff Sharkey
cb54ffb2cb Merge "Protect runtime storage mount points." into mnc-dev 2015-08-06 19:27:42 +00:00
Chris Wren
93f3fc8766 Merge "add metrics to assistant" into mnc-dev 2015-08-06 19:18:17 +00:00
Benjamin Franz
339a9bbf6d Merge "Use realActivity as indicator for task locking" into mnc-dev 2015-08-06 19:15:29 +00:00
Chris Wren
a35c96eb90 add metrics to assistant
long press
  screenshot enabled
  context enabled

Bug: 22949579
Change-Id: Iac178207fa7149cda03c9a817a0d1450e46e1c59
2015-08-06 15:11:42 -04:00
Svetoslav Ganov
38c0fbda53 Merge "Pregrant unrevokable storage permission to the CertInstaller" into mnc-dev 2015-08-06 19:08:33 +00:00
Paul Mclean
af7748efb6 Merge "Consider channel index masks when calculating channel counts." into mnc-dev 2015-08-06 18:59:06 +00:00
Paul Mclean
c770b7a537 Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into mnc-dev 2015-08-06 18:58:33 +00:00
Jeff Sharkey
928e1ecfe2 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
2015-08-06 11:46:30 -07:00
Alan Viverette
c7f8133fa1 Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev 2015-08-06 17:48:22 +00:00
Benjamin Franz
6fd84cc878 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
2015-08-06 18:09:03 +01:00
Dianne Hackborn
6b0f1e78b8 Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev 2015-08-06 16:48:34 +00:00
Alan Viverette
697804e8de 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
2015-08-06 12:36:47 -04:00
Chet Haase
da493aa6ea Merge "Avoid changing internal state of shared drawable" into mnc-dev 2015-08-06 16:23:20 +00:00
Paul McLean
8b2562b14c Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test.
Bug: 22792346
Change-Id: I8a10eb68368ede4baa0d2fd0d71cfff2fced4b75
2015-08-06 10:03:13 -06:00
Alan Treadway
190a88d2ce Merge "Update documentation of DevicePolicyManager intents." into mnc-dev 2015-08-06 15:47:34 +00:00
Alan Treadway
4582f8113d 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
2015-08-06 16:44:52 +01:00
Chet Haase
bfa11e4ab8 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
2015-08-06 07:55:24 -07:00
Michael Wright
d5a6df6d22 Merge "Make the NullVibrator really null." into mnc-dev 2015-08-06 13:52:34 +00:00
Michael Wright
eb7e3d7e45 Merge "Don't dispatch when non-interactive and the display is off." into mnc-dev 2015-08-06 13:50:37 +00:00
Julia Reynolds
a3b5a61271 Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev 2015-08-06 13:41:01 +00:00
Geoff Mendal
375c792c17 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-08-06 04:12:38 +00:00
Mitchell Wills
d14c48444a Merge "Pass connection configuration when setting wifi info" into mnc-dev 2015-08-06 02:23:44 +00:00
Svetoslav
0e62952aad Pregrant unrevokable storage permission to the CertInstaller
bug:22988119

Change-Id: I310aa7149f67a7918cecfda13c69ab91c7c6e1a8
2015-08-05 19:14:51 -07:00
Geoff Mendal
f71c108b3c Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 22842106
Change-Id: I473bc0dc200e1eec3bd0f907526fcf808ee86e36
2015-08-05 17:54:19 -07:00
Amit Mahajan
be948f5a9f Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev 2015-08-05 23:09:58 +00:00
Jim Miller
120fc2c74e Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev 2015-08-05 22:47:57 +00:00
Mitchell Wills
5a42db2e9c Pass connection configuration when setting wifi info
This allows the both the ssid and connection info to be verified when
updating wifi info.

Bug: 22797622
Change-Id: I82d771a299e17469683516c6b1077cb260981812
2015-08-05 15:39:19 -07:00
Yorke Lee
f0affc6d46 Merge "Correctly hide setConnectionService" into mnc-dev 2015-08-05 22:13:07 +00:00
Dianne Hackborn
6bdd3a155f Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult
Add new Activity callback to tell it when its saved state has
been invalidated.

The problem is that delivering the permission result does not go
through a path where the compatibility code can see it first to
mark its fragment manager as no longer having saved state.  So this
new callback gives it a place to do that.

Change-Id: I5a4a185d9c746bae1afb5c588aba82c8daccf079
2015-08-05 15:01:28 -07:00
Jeff Davidson
16ed6a45ae Correctly propagate permissions when uninstalling updates.
In ag/733689, which was intended to fix this bug, the following lines
were removed:

// Propagate the permissions state as we do want to drop on the floor
// runtime permissions. The update permissions method below will take
// care of removing obsolete permissions and grant install permissions.
ps.getPermissionsState().copyFrom(disabledPs.getPermissionsState());

The intent with these lines seemed to be that we needed to copy
permissions from the application on /data, which is being uninstalled,
over to the copy on /system, which was disabled but is being
reenabled. However, it wasn't functional, because it incorrectly
copied from the copy on /system, not the copy on /data.

Restore this code, copying from newPs (the copy on /data) rather than
disbledPs (the copy on /system), and clarify the comment because we do
*not* want to drop runtime permissions on the floor.

Bug: 22665508
Change-Id: I6bae37e70b6df1043c9a2b49255b985707ba151a
2015-08-05 14:33:17 -07:00
Deepanshu Gupta
2c1a22d916 Merge changes I85106f37,I7db398aa into mnc-dev
* changes:
  Make getInt in BridgeTypedArray accept empty String.
  Fix layout mirroring.
2015-08-05 21:11:40 +00:00
Paul Mclean
8eaf18b0ab Merge "Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices." into mnc-dev 2015-08-05 20:50:29 +00:00
Jim Miller
8ae1be1208 Disable fingerprint when remotely reset by DPM
When the device is lost or stolen, it's safer to
fall back to strong authentication (pin, pattern or
password).  This disables fingerprint like we do with
trust agents.

Fixes bug 21620081

Change-Id: I7bbe54be3721b2f160b783daeb3acbe434705046
2015-08-05 20:06:37 +00:00
Paul McLean
22cfec3cb8 Documenting behavior of returning a 0-length array for formats,
channels, rates queries for analog devices.

Bug: 22729461
Change-Id: I3cb1d586f6264e3627cbb0261a3b2c74ca51cf6b
2015-08-05 14:06:28 -06:00
Phil Burk
881cd15519 Merge "MidiManager: use ConcurrentHashMap" into mnc-dev 2015-08-05 19:43:21 +00:00
Vladislav Kaznacheev
8cc0024342 Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev 2015-08-05 19:34:38 +00:00
Amit Mahajan
69b55b5f03 Removing tethering overlay for mcc202-mnc05 (VF Greece).
Bug: 22942869
Change-Id: I1d80ab3a66f7e1cd8e497b0d4236f80b0a126228
2015-08-05 11:11:56 -07:00
Yohei Yukawa
db221acce2 Merge "Reduce log spam for the ease of debugging Bug 22857361." into mnc-dev 2015-08-05 17:59:23 +00:00