197877 Commits

Author SHA1 Message Date
Jeff Sharkey
3ba2bfa7b2 Merge "Expand ringtone titles to support OGG and FLAC." into mnc-dev 2015-08-03 20:54:32 +00:00
Jeff Sharkey
449e5fd5f8 Expand ringtone titles to support OGG and FLAC.
These file types don't have "audio/" MIME type, so check for those
MIME types explicitly.

Bug: 22803550
Change-Id: Ia62f94ad4a19409d6a50462935de005bc572f93a
2015-08-03 13:51:13 -07:00
Wale Ogunwale
f85769797e Merge "Also consider task intent when trimming recent tasks" into mnc-dev 2015-08-03 20:31:31 +00:00
Alan Viverette
7b4170fa7f Merge "Update Material link text to be colorAccent" into mnc-dev 2015-08-03 20:27:17 +00:00
Jim Miller
45fcaa547d Merge "Don't wipe device because of short PIN, patterns or passwords" into mnc-dev 2015-08-03 20:25:00 +00:00
Alan Viverette
ef3f58e59b Merge "Make ResolverDrawerLayout look like a ScrollView to accessibility" into mnc-dev 2015-08-03 20:17:57 +00:00
Alan Viverette
e76bf46ab9 Merge "Add badge content description to TargetInfo, use in ResolverActivity" into mnc-dev 2015-08-03 20:17:31 +00:00
Billy Lau
5680f9f6d6 Merge "Bug: 22879202 App compatibility with WRITE_SETTINGS failing" into mnc-dev 2015-08-03 19:53:28 +00:00
Svetoslav Ganov
87920455ae Merge "Fix NPE in AppOpsService" into mnc-dev 2015-08-03 19:41:34 +00:00
Svetoslav Ganov
0855357c4f Merge "User correct category for finding headless sync adapters" into mnc-dev 2015-08-03 19:41:15 +00:00
Jim Miller
51e3a672e0 Don't wipe device because of short PIN, patterns or passwords
This fixes a bug where we were counting short PIN, patterns and
passwords as attempts. For devices with a device policy admin,
this would cause devices to get wiped after a short amount of
interaction with the UI.

Fixes bug 22844609

Change-Id: I7616b38d954f89d4a2cee23f9aec1b898041b1f2
2015-08-03 19:36:24 +00:00
Lajos Molnar
0ca1e98fdf Merge "media: Clarify MediaCodec and CodecCapabilities documentation" into mnc-dev 2015-08-03 18:17:57 +00:00
Alan Viverette
8c558f3d43 Update Material link text to be colorAccent
Bug: 22918108
Change-Id: I29b795b4c8d2a017dcaca1a9b65705eafaf2140c
2015-08-03 12:42:14 -04:00
Ruben Brunk
7469060e78 Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev 2015-08-03 16:09:07 +00:00
Jason Monk
66845a36c9 Add more dump info about emergency calls state
Bug: 21549528
Change-Id: Idbd70e2f4b1b3285af283a28dc1933c02ad8d04c
2015-08-03 11:09:41 -04:00
Alan Viverette
1ff29f2d56 Make ResolverDrawerLayout look like a ScrollView to accessibility
Disable accessibility focus on the layout itself and expose the class
name as ScrollView so that we can get auto-scroll working until we have
first-class support for specifying automatic scrolling behavior.

Bug: 22667764
Change-Id: I9b97e40f16038046898e5b56b935a61db9073ac6
2015-08-03 10:01:23 -04:00
Svet Ganov
f3807aa572 Fix NPE in AppOpsService
bug:22802981

Change-Id: I73eee5ff9cf1603d8f30355554ef075aa14afd30
2015-08-02 10:14:48 -07:00
Wale Ogunwale
2ab53cf23e Also consider task intent when trimming recent tasks
7cbfcd88657ac7d5ab1baf8c964b669c9bd21e24 we stopped comparing
the tasks realActivity when trimming recent task. This led to
task with the same intent been duplicated in the recents list.
We now consider the task intent when deciding when to trim like
we did pre 510e554283d3dc250f836cd3e4abc36d87319333.

Bug: 22812470
Bug: 22564474
Bug: 18642190
Change-Id: I90b3ab9cf7a06b4691099f697e723d8a54def9fa
2015-08-02 00:30:23 +00:00
Svet Ganov
05069b96d0 User correct category for finding headless sync adapters
bug:22857409

Change-Id: Icc42f1af72c59fba3c60e1bcd558c621df70940a
2015-08-01 12:19:30 -07:00
Billy Lau
7c19f4cf20 Bug: 22879202 App compatibility with WRITE_SETTINGS failing
Fix a bug in the app ops protected permission check that broke backwards
compatibility.

Change-Id: Ic73759edd29a479a670fb31407e36aa50d09b6c3
2015-08-01 13:16:25 +01:00
Svetoslav Ganov
8dbd484850 Merge "Add per UID control to app ops." into mnc-dev 2015-08-01 02:28:02 +00:00
Svet Ganov
2af5708ab0 Add per UID control to app ops.
The app ops mananger service maintains a mapping from UID to
a list of packages where each package is mapped to a list of
non-default app op states (default states are inferred and
not stored). Hence, specifying the app op state for a UID
requires setting the app op for each package in the shared
UID.

This is problematic when installing new packages if there
is a non-default app op policy set for another already
installed package in the same UID as the app op for the new
package has to be updated to be in sync. The package installer
cannot do this as it is in another process and the app op
update will not be atomic. Therefore, the app ops manager
service has to support specifying app op policy on a per
UID basis.

We now have a UID state object that contains the per package
non-default app op states as well as the per uid non-default
app op states. If there is a UID policy specified then it
takes precedence over the per package one. Even further,
changing the uid policy updates the package policies in this
UID if the state is non-default. Changing a package app op
state also updates the app op state for the whole UID if
the per UID policy for this op is non-default. Clearing the
app op state for a package, clears the policy for the UID
as well.

bug:22802981

Change-Id: I78044906d9fcc6066abf07e706c2c88f3397d293
2015-07-31 17:45:27 -07:00
Jan Nordqvist
cb9c0940d4 Merge "Added logging in a few error paths for wifi config installation." into mnc-dev 2015-08-01 00:30:42 +00:00
Jan Nordqvist
f6d3d148d5 Added logging in a few error paths for wifi config installation.
Bug: 22790527
Change-Id: I71b298b98da098f647f52886c3c3a7456cb24d51
2015-07-31 17:19:49 -07:00
Ruben Brunk
c620eb7e86 Make vendor keys visible in Camera2 java APIs.
- Add vendor keys to getKeys() calls for CameraCharacteristics,
  CaptureRequest, and CaptureResult.
- Vendors can specify whether custom keys show up by listing
  visible keys in the REQUEST_AVAILABLE_RESULT_KEYS field.
- Vendor key types are always treated as a primitive (or Rational)
  array type corresponding to one of the valid types for
  a camera metadata entry.

Bug: 22067625
Change-Id: I6e7dd3db7a8bf533c2ec15ff69ca38824134e971
2015-07-31 17:14:18 -07:00
Chris Wren
6e75e7dd98 Merge "Instrument printing service for metrics collection." into mnc-dev 2015-08-01 00:11:16 +00:00
Selim Cinek
f92a1fdb77 Fixed a bug where notifications shadows were blinking out
Bug: 22567770
Change-Id: I2d335241a287d0c64e659221994f19b7c13eccd3
2015-07-31 23:24:55 +00:00
Filip Gruszczynski
00ab35783c Merge "Make enter reveal animation be zorder top." into mnc-dev 2015-07-31 22:31:22 +00:00
Dianne Hackborn
fb68b0ad34 Merge "Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties" into mnc-dev 2015-07-31 22:29:34 +00:00
Jean-Michel Trivi
ffbdb8ad86 Merge "Fix that shutter sound does not play after ringer mode changes to vibrator" into mnc-dev 2015-07-31 22:18:35 +00:00
Lajos Molnar
afa6ceb5a0 media: Clarify MediaCodec and CodecCapabilities documentation
Bug: 21932760
Bug: 22847191
Change-Id: Iacd24099a98c73fe4fb50226564690aa9b01c772
2015-07-31 14:48:47 -07:00
Alan Viverette
5cca30a4ee Merge "Revert two changes to LinearLayout measurement" into mnc-dev 2015-07-31 21:30:48 +00:00
Alan Viverette
ce5d92c313 Add badge content description to TargetInfo, use in ResolverActivity
Bug: 22667344
Change-Id: Iee241b9179c74a15b1c635cf90d2f96f6f7b31cd
2015-07-31 16:46:56 -04:00
Dianne Hackborn
afb308d651 Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties
Change-Id: I928882d42d0546cc6a12e803d96131beaba76d4e
2015-07-31 13:10:55 -07:00
Alan Viverette
9d8a230fbd Revert "View measurement optimization"
LinearLayout relied on multiple measurement passes to hide a
discrepancy between EXACTLY and non-EXACTLY measurements.

This reverts commit 9cefbda11ee5308145d58b0b99ced0f66a0b1cf9.

Bug: 22810327
Change-Id: I515a80749420d00efc5002fa68221b7c236f03df
2015-07-31 19:53:02 +00:00
Winson Chung
c35e670d53 Moving removeTask to separate thread.
Bug: 22760556
Change-Id: Iac6eef77e3ba5432ac1cd4aa792e7b2aadc27c01
2015-07-31 12:47:25 -07:00
Filip Gruszczynski
9e2cf5be18 Make enter reveal animation be zorder top.
This fixes the bug where launcher icons become temporarily visible when
home button is pressed while other activity is starting. By having the
starting activity's animation be zoder top, it will continue to be drawn
on top of the launcher until it animates away.

Bug: 22809202
Change-Id: If5e3c09b7a5df4537c355f94e986766f77ad4943
2015-07-31 19:38:22 +00:00
Winson Chung
92e0c86fa2 Merge "Ensuring that we don't try to use and propagate null activity labels." into mnc-dev 2015-07-31 19:20:51 +00:00
Deepanshu Gupta
e836a229ae Fix build.
Change-Id: I82295b758e5ceb42e260d3c36ea2310a9def5190
2015-07-31 12:11:12 -07:00
Winson Chung
fce23748c4 Ensuring that we don't try to use and propagate null activity labels.
- Also fixes issue with tapping outside bounds not working to dismiss recents

Bug: 21774486
Bug: 22241587
Change-Id: Ib50f6fece8fb150929a1f8cdb01b8e8fe7b665cd
2015-07-31 18:51:58 +00:00
Wale Ogunwale
f7e00dbd08 Merge "Fixed issue with artifacts during scale-up transition animation" into mnc-dev 2015-07-31 18:45:08 +00:00
Dianne Hackborn
ebbc891ae4 Merge "Fix build." into mnc-dev 2015-07-31 18:19:11 +00:00
Dianne Hackborn
e5d926deb2 Fix build.
Change-Id: I9c6b6cd354039ff2914837cfe97a783564ded66f
2015-07-31 11:17:43 -07:00
Glenn Kasten
37f559be42 Merge "Improve getTimestamp documentation" into mnc-dev 2015-07-31 18:04:16 +00:00
Dianne Hackborn
692a244bff Fix build.
Change-Id: Icdf6fa14e53a1c030d0d90205d3bf2d7610b6196
2015-07-31 10:35:34 -07:00
Dianne Hackborn
c1836bb0f1 Merge "Change MNC codename to just M." into mnc-dev 2015-07-31 17:11:58 +00:00
Alan Viverette
5a969dfd8e Revert two changes to LinearLayout measurement
"Include non-zero dimension views in excess space calculation" and
"Always distribute excess space in LinearLayout measurement" changed
LinearLayout behavior significantly in a way that wasn't covered by
CTS tests.

This reverts commits da2f3044092318d44173bdb9918f31c592b86a73 and
4fabc021583cfd5cc551eda7d7b9809683a6ca9a.

Bug: 22862047
Change-Id: I8d37a525ccf295445d3239b80e5cacb10bf3c947
2015-07-31 12:42:10 -04:00
Sungmin Choi
841ed0a041 Fix that shutter sound does not play after ringer mode changes to vibrator
Reproduce sequence:

1. Change ring volume to vibration in Settings > Sound & notification
   > Ring volume using touch
2. Launch camera app
3. Capture, but cannot hear shutter sound
4. Even change ringtone to maximum, shutter sound is not played before reboot

Bug: 22589664
Change-Id: I90eb044eaf21f3b558bf050bf1d9f0b33ea4888b
2015-07-31 09:24:51 -07:00
Tyler Gunn
d0694da4fb Merge "Add telecom extra keys required for DMR release." into mnc-dev 2015-07-31 15:42:48 +00:00
Julia Reynolds
5d6a2d387c Merge "Fix SysUI crash on device boot." into mnc-dev 2015-07-31 13:49:26 +00:00