Commit Graph

220917 Commits

Author SHA1 Message Date
Mikhail Naganov
9daceaf609 Small update to WebResourceRequest.isRedirect
Specify that 'isRedirect' is only true for server-side redirects.

Bug: 22346196
Change-Id: I9a8c31476c796265f554327dfff46778c5f84399
2015-11-02 15:38:29 -08:00
Makoto Onuki
4f16073556 Make UserManager enforce user restrictions, not DPM.
- Now even if a user restriction is set via UserManager, it'll be correctly
enforced.

- Changed the way AudioService enforces the OP_MUTE_MICROPHONE and
OP_AUDIO_MASTER_VOLUME app ops -- previously, when they're set, even a muting
call would be rejected.  This was why DPMS.setUserRestriction() used different
calling orders for DISALLOW_UNMUTE_MICROPHONE/DISALLOW_ADJUST_VOLUME depending
on setting them or clearing them.
Now, even when the app ops are set, we still allow muting calls.

Bug 23902097
Bug 24981972

Change-Id: I865b5de43e15f5955f94006475a5ec6254904d31
2015-11-02 14:07:11 -08:00
Makoto Onuki
5263492de6 Merge "Allow DO to disable camera device-wise." 2015-11-02 22:00:09 +00:00
Phil Burk
3ac162ecc0 Merge "UsbMidiDeviceJNI: fix race condition" 2015-11-02 21:38:36 +00:00
Makoto Onuki
759a763f5f Allow DO to disable camera device-wise.
Bug 24538855

Change-Id: I421690f14ee57fa818d2b233fe48a90a0a575a9e
2015-11-02 13:33:58 -08:00
Rob Carr
c356b2a537 Merge "Ensure crop rect is scaled appropriately." 2015-11-02 21:31:08 +00:00
Rob Carr
31b09bdcdd Merge "Sync SurfaceView position changes to parent render." 2015-11-02 21:30:56 +00:00
Jun Mukai
4c759ca99f Merge "Fix: ToolType() check -> isFromSource()." 2015-11-02 21:27:24 +00:00
Chris Craik
2359d85e31 Merge "Initial HW layer support in new reorderer/renderer" 2015-11-02 21:16:37 +00:00
Jun Mukai
36a9946b23 Fix: ToolType() check -> isFromSource().
Change-Id: I8e13a179dc076cc44248662e6e8fd60e8cc69a3f
2015-11-02 13:15:00 -08:00
Chris Craik
0b7e8245db Initial HW layer support in new reorderer/renderer
Shares vast majority of clipped savelayer code, with only minor
differences in lifecycle.

Doesn't yet handle fill region, resize, or window transform.

Change-Id: Iabdd71811590d2b937eb11e1b01ce556ade54a5a
2015-11-02 12:59:38 -08:00
Wale Ogunwale
02a5a6bb9b Merge "Added StackId object for checking what features a stack supports" 2015-11-02 20:38:39 +00:00
Svetoslav Ganov
aad093b675 Merge "Allow verifier to grant permissions" into mnc-dr-dev am: cfa233eefb am: 22d7f4c2ed am: 6423c0a29b
am: bd4168540f

* commit 'bd4168540f009c71af1242e5b7866146c8724d6f':
  Allow verifier to grant permissions
2015-11-02 20:00:13 +00:00
Glenn Kasten
1662ccc975 Merge "Update AudioManager.getProperty documentation" 2015-11-02 19:55:37 +00:00
Glenn Kasten
6a230aa10b Merge "CDD for pro audio feature does not specify acoustics" 2015-11-02 19:54:41 +00:00
Svetoslav Ganov
bd4168540f Merge "Allow verifier to grant permissions" into mnc-dr-dev am: cfa233eefb am: 22d7f4c2ed
am: 6423c0a29b

* commit '6423c0a29bfb3191787febf3755539948514fb61':
  Allow verifier to grant permissions
2015-11-02 19:52:38 +00:00
Svetoslav Ganov
6423c0a29b Merge "Allow verifier to grant permissions" into mnc-dr-dev am: cfa233eefb
am: 22d7f4c2ed

* commit '22d7f4c2eddef09e0ceb16aadff2860a184a68d8':
  Allow verifier to grant permissions
2015-11-02 19:45:17 +00:00
Svetoslav Ganov
22d7f4c2ed Merge "Allow verifier to grant permissions" into mnc-dr-dev
am: cfa233eefb

* commit 'cfa233eefb5b77c96a3239a5a51f381a7f0722c9':
  Allow verifier to grant permissions
2015-11-02 19:38:22 +00:00
Svetoslav Ganov
cfa233eefb Merge "Allow verifier to grant permissions" into mnc-dr-dev 2015-11-02 19:33:44 +00:00
Wale Ogunwale
3797c22ea1 Added StackId object for checking what features a stack supports
Helps make the code easier to follow since we are no longer checking
multiple stack ids at various decision points.

Bug: 25282299
Change-Id: Ifa6864a1ef56ce2eca4c94f87a4e0b993de987cd
2015-11-02 11:32:42 -08:00
Adam Lesinski
104e028c3a Merge "AAPT2: Support generating Manifest.java" 2015-11-02 19:09:42 +00:00
Glenn Kasten
082a4c86cf Merge "Explain ENCODING_PCM_FLOAT" 2015-11-02 19:05:44 +00:00
Alan Viverette
978db40983 Merge "Refactor MagnificationController out to its own class" 2015-11-02 18:46:48 +00:00
Winson Chung
723b5d90df Merge "Prevent and log invalid cache entries." 2015-11-02 18:36:27 +00:00
Alan Viverette
36555baa55 Merge "Support for changing density of GradientDrawable" 2015-11-02 18:36:09 +00:00
Badhri Jagan Sridharan
2b2e24c2ab Merge "BatteryService: Add Max charging voltage" 2015-11-02 18:35:09 +00:00
Winson
eb1b65a976 Prevent and log invalid cache entries.
Bug: 25413518
Change-Id: Id0a7384eccd25ba766feb0c568b4c16db2b6f6c8
2015-11-02 10:33:16 -08:00
Phil Burk
32bfb874e3 UsbMidiDeviceJNI: fix race condition
Try multiple times to open the MIDI control device.
This fixes a race condition that caused Android to
sometimes not see a USB MIDI keyboard when it was plugged in.

Bug: 25328161
Change-Id: Ic72c5859364fc56bf7a40c1b1c9791c42827ea63
Signed-off-by: Phil Burk <philburk@google.com>
2015-11-02 10:30:34 -08:00
Winson Chung
d1f2ebcdb3 Merge "Add ability to cancel task window transitions." 2015-11-02 18:17:12 +00:00
Winson
c28098f69b Add ability to cancel task window transitions.
Bug: 25392381

Change-Id: I45f48edc21c058df0e4c22ceaf7e9aef5899a29c
2015-11-02 10:16:23 -08:00
Jeff Sharkey
be8c7c8d04 PackageSettingBase needs to copy volume UUID. am: 3b1c6e03f6 am: e63509b509 am: 12d2e98fe0
am: ca3b971e7a

* commit 'ca3b971e7a4c3ca8e55eaa505556a02964b4e299':
  PackageSettingBase needs to copy volume UUID.
2015-11-02 18:12:22 +00:00
Jeff Sharkey
ca3b971e7a PackageSettingBase needs to copy volume UUID. am: 3b1c6e03f6 am: e63509b509
am: 12d2e98fe0

* commit '12d2e98fe07764475cae788aa6ff20406d1ee4c9':
  PackageSettingBase needs to copy volume UUID.
2015-11-02 18:05:17 +00:00
Winson
2dd7694681 Reporting task bounds in RecentTaskInfo.
Change-Id: I8e88d1aca5fa0ee316e93afe4fb63264e2d338f0
2015-11-02 18:04:38 +00:00
Jeff Sharkey
12d2e98fe0 PackageSettingBase needs to copy volume UUID. am: 3b1c6e03f6
am: e63509b509

* commit 'e63509b5093776e0320876719226cbbb16cc5eab':
  PackageSettingBase needs to copy volume UUID.
2015-11-02 17:58:35 +00:00
Jeff Sharkey
e63509b509 PackageSettingBase needs to copy volume UUID.
am: 3b1c6e03f6

* commit '3b1c6e03f67ba8e4a4f4a98e996c7ceabf36affa':
  PackageSettingBase needs to copy volume UUID.
2015-11-02 17:51:53 +00:00
Tony Mantler
2858bd2e36 Merge "Move more Accessibility stuff to SettingsLib" 2015-11-02 16:46:57 +00:00
Tor Norbye
562bb9f3a7 Merge "Don't set modification times in aapt zip entries" 2015-11-02 15:02:28 +00:00
Chris Wren
2667e48b28 fix a bug that is keeping us from counting API use
Bug: 25390174
Change-Id: Ieaf9386640140f4d9f30a566714111749ada6e00
2015-11-02 14:42:12 +00:00
Clara Bayarri
e19dcaa50f Merge "Return actual userId when File Based Encryption is present" 2015-11-02 10:31:58 +00:00
Daichi Hirono
6de8a0e51f Implement ID mapping for root documents.
MTP identifiers like object handle is unstable over MTP sessions.  The
CL introduce two methods to MtpDatabase that enables the provider to
remap exisitng document ID with new MTP identifiers when the provider
reopen the MTP session.

 * MtpDatabase#clearMtpIdentifier invalidates old MTP identifiers
 * MtpDatabase#resolveRootDocuments remaps invalidated documents with
   new MTP identifier.

BUG=25162822

Change-Id: Iadb668ae5932da81aba2b2731d0d185da5656f16
2015-11-02 11:30:47 +09:00
Jeff Sharkey
3b1c6e03f6 PackageSettingBase needs to copy volume UUID.
When copying all fields from one PackageSettingBase to another, we
also need to copy volumeUuid, which had previously been missed.

Without this, packages using sharedUserId that are installed on
adopted storage devices will be destroyed, since after reboot we
think they actually belong on internal storage (where volumeUuid is
null).

Bug: 25334169
Change-Id: I223361bd1e19e7d5dd78626682ac7c5cbecb9fa1
2015-10-31 14:04:37 -07:00
Tor Norbye
b3559643b9 Don't set modification times in aapt zip entries
Use a modification timestamp of 0 for all files
inside the zip archive to make the build repeatable.

Change-Id: Ie6e57329469b99c6f93cb0a6083e0c402be99815
2015-10-30 20:00:13 -07:00
Selim Cinek
01a46f4e25 Merge changes from topic 'notification_children'
* changes:
  Follow up CL for notification children change
  Allow expanding notification groups by dragging down
  Changed the appearance of notification bundles
  Hiding subtext of children notifications now
  Hiding the children backgrounds now
  Introduced the notification header
  Slight refactoring of notification groups
  Fixed a bug where a notification could stay userlocked
2015-10-31 01:45:35 +00:00
Glenn Kasten
0b986af895 Update AudioManager.getProperty documentation
Change-Id: I004bfdbbac9b0897931fa206bff865bdb600ebf6
2015-10-30 18:27:14 -07:00
Glenn Kasten
a217f8f9ca Explain ENCODING_PCM_FLOAT
Change-Id: Icf680f65f07023ca6e416a1ef6067132daf607b9
2015-10-30 18:27:02 -07:00
Glenn Kasten
7587edccd0 CDD for pro audio feature does not specify acoustics
Change-Id: If24a2ee485a35ad18969abacf55798b64ff939af
2015-10-30 18:26:49 -07:00
Selim Cinek
a6c6bfb61b Follow up CL for notification children change
The CLs of the notification children change have been
quite overlapping, so a few comments are addressed in this
change.

Bug: 24866646
Change-Id: If3cd029f5a97302fc33f3e2b6b6b147938ddcd3e
2015-10-30 16:28:40 -07:00
Selim Cinek
388df6dd3d Allow expanding notification groups by dragging down
Bug: 24866646
Change-Id: Ie7c5ee6753c2f246df04189bb92e08baf0242797
2015-10-30 16:28:40 -07:00
Selim Cinek
83bc783384 Changed the appearance of notification bundles
Children now show up as one line notifications even
if the summary is not expanded. The childrenContainer
shows a summary if there are some which don't fit
in there currently.

Bug: 24866646
Change-Id: I0cfae9342722c9f8941f51704618190cfe4e76b4
2015-10-30 16:28:39 -07:00
Selim Cinek
8d6440dbab Hiding subtext of children notifications now
If the parent header already displays the email
we don’t want to display it again in the child.

Bug: 24866646
Change-Id: I3aee62e895fef68b059a61a825eef37f0f8ad875
2015-10-30 16:28:39 -07:00