204297 Commits

Author SHA1 Message Date
Paul Mclean
0c3c81ef03 am af7748ef: Merge "Consider channel index masks when calculating channel counts." into mnc-dev
* commit 'af7748efb6cf4ecca07ab7a76b678a04387e2e40':
  Consider channel index masks when calculating channel counts.
2015-08-06 19:06:18 +00:00
Paul Mclean
9048088de5 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.
2015-08-06 19:06:11 +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
ad8537778f 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
2015-08-06 17:55:02 +00: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
Matthew Williams
b9ebed56e4 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
2015-08-06 10:28:08 -07: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
aa8daf7851 am 6b0f1e78: Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev
* commit '6b0f1e78b841a32b45f513d283202e3af90c6a73':
  Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult
2015-08-06 16:55:05 +00: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
26762506bc am da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev
* commit 'da493aa6eab24de98b63cc63c457f5b899da3ad2':
  Avoid changing internal state of shared drawable
2015-08-06 16:29:00 +00: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
e4b8c760ba am 190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev
* commit '190a88d2ce6a08d0eb98d774b81e5ca6b82b45f8':
  Update documentation of DevicePolicyManager intents.
2015-08-06 15:52:38 +00: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
46b7af57d7 am d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev
* commit 'd5a6df6d228036258d616245502c1a4f85ba4b2e':
  Make the NullVibrator really null.
2015-08-06 13:59:40 +00:00
Michael Wright
7a125e455d 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.
2015-08-06 13:59:32 +00: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
24d7c503a1 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.
2015-08-06 13:48:36 +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
307be111b0 am 375c792c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '375c792c176be43720da47db2cfced23613f537c':
  Import translations. DO NOT MERGE
2015-08-06 04:20:12 +00:00
Geoff Mendal
375c792c17 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-08-06 04:12:38 +00:00
Mitchell Wills
088c8de233 am d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev
* commit 'd14c48444a40fa2f964461e2f1317bcc3e256295':
  Pass connection configuration when setting wifi info
2015-08-06 02:30:36 +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
Yusuke Sato
e15a5871bd am 61234dea: am bd4c482b: Merge "Clean up AssetManager::scanAndMergeZipLocked"
* commit '61234deafe78ded05569edfab24536cdb4bd7720':
  Clean up AssetManager::scanAndMergeZipLocked
2015-08-06 01:39:44 +00: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
Yusuke Sato
61234deafe am bd4c482b: Merge "Clean up AssetManager::scanAndMergeZipLocked"
* commit 'bd4c482be9c060d92919080c37e0d14fca94d2aa':
  Clean up AssetManager::scanAndMergeZipLocked
2015-08-05 23:38:47 +00:00
Amit Mahajan
96e2975cbb am be948f5a: Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev
* commit 'be948f5a9f519210c5522060ec9ee3bc77eb077e':
  Removing tethering overlay for mcc202-mnc05 (VF Greece).
2015-08-05 23:19:46 +00: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
a950fe0ab3 am 120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev
* commit '120fc2c74eb290e06cddf1b52d363338f940c612':
  Disable fingerprint when remotely reset by DPM
2015-08-05 22:51:43 +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
3d98e175b9 am f0affc6d: Merge "Correctly hide setConnectionService" into mnc-dev
* commit 'f0affc6d46849e844bec9ddc755ffae0042e443f':
  Correctly hide setConnectionService
2015-08-05 22:20:43 +00:00
Yusuke Sato
bd4c482be9 Merge "Clean up AssetManager::scanAndMergeZipLocked" 2015-08-05 22:15:50 +00: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
Yusuke Sato
c1efd41f3f Fix build breakage caused by I5ebe0438019958d883a7fda6bd92ea4484211d23 (AOSP)
Change-Id: Icea0ac00c56b5c8aa21134fc49b518cda4759e36
2015-08-05 14:41:52 -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
63cd28afc3 am 2c1a22d9: Merge changes I85106f37,I7db398aa into mnc-dev
* commit '2c1a22d91607e18c7618e79ab026d3c5c4ce8949':
  Make getInt in BridgeTypedArray accept empty String.
  Fix layout mirroring.
2015-08-05 21:19:52 +00: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
f89aedbf8b am 8eaf18b0: Merge "Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices." into mnc-dev
* commit '8eaf18b0ab77184f16870428258650bd12bb2ea5':
  Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices.
2015-08-05 21:00:46 +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