Commit Graph

27195 Commits

Author SHA1 Message Date
Jae Seo
1d3e3ca157 Merge "TIF: Use per-user ContentResolver in the TvInputManagerService" into mnc-dev 2015-06-24 04:53:08 +00:00
Jae Seo
8c375feb68 TIF: Use per-user ContentResolver in the TvInputManagerService
When switched to a different user (e.g. Restricted profile), the
TvInputManagerService continues to use the TV storage of the previous
user for logging, resulting in failure of the FOREIGN KEY constraint
since channel data for the current user don’t match to the logging data.
This change ensures that the system service uses the proper
ContentResolver when the user is switched.

Bug: 22047202
Change-Id: I870b5bd921e37a5f1219ea66c7a51314c77ddb01
2015-06-23 20:50:21 -07:00
Simranjit Singh Kohli
29124960c6 Merge "[Modify LastAuthenticatedTimestamp behaviour]:" into mnc-dev 2015-06-24 01:24:45 +00:00
Ricardo Garcia
2eab06c38f Merge "Fix for SafeMedia logic and CTS tests" into mnc-dev 2015-06-24 00:24:44 +00:00
Bryce Lee
d389684bea resolved conflicts for merge of 91d2cbf4 to mnc-dev
Change-Id: I1c7e2999483a7959630844ecd20f5f37b7896aae
2015-06-23 17:06:51 -07:00
Sharvil Nanavati
e7908c7ff2 resolved conflicts for merge of 64a4858b to mnc-dev
Change-Id: I9340b816232285853740c03d5e9898fdd019ff0e
2015-06-23 16:23:06 -07:00
Svetoslav Ganov
2c99ea3524 Merge "Remove not needed contacts related permissions." into mnc-dev 2015-06-23 23:04:20 +00:00
Svetoslav Ganov
6d2c0e5ee2 Remove not needed contacts related permissions.
This reverts commit ed5ff51b2c.

Change-Id: If2407e4e474a438d95e1b7ad1aa6f441bb3ace08
2015-06-23 23:03:55 +00:00
Ricardo Garcia
3a30a76e88 Fix for SafeMedia logic and CTS tests
Added audio.safemedia.bypass system property to bypass SafeMedia logic on
CTS tests which require guaranteed access to full range of volume levels.

bug: 21779099
Change-Id: I76815a995f08d426218206af7aade491c5debd9e
2015-06-23 15:54:45 -07:00
Todd Kennedy
c60408264c Merge "Skip upgrade keys for adopted storage" into mnc-dev 2015-06-23 21:42:06 +00:00
Todd Kennedy
c003989488 Merge "Handle volume benchmark timeout" into mnc-dev 2015-06-23 21:41:20 +00:00
Todd Kennedy
8101ee6884 Handle volume benchmark timeout
If a volume benchmark operation times out, we don't want to show
a cryptic toast message. Instead, we return a very large integer
[eg Long.MAX_INT]. The storage wizard can then use this value
to show an appropriate dialog if it chooses.

Bug: 21376364
Change-Id: I3d97336e19c93511cfff2cbdb2f07ab033a1143d
2015-06-23 14:40:32 -07:00
Adam Lesinski
ad5f292b03 Merge "Extend the time between WiFi energy samples" into mnc-dev 2015-06-23 21:12:35 +00:00
Sharvil Nanavati
64a4858b32 resolved conflicts for merge of 7c250056 to lmp-mr1-ub-dev
Change-Id: I8ec2e76756e61a6e6bbe85ca699facbde1c1fbc7
2015-06-23 14:07:26 -07:00
oleksii stepanian
e695391353 Merge "Send installerUid for verification when using PackageInstaller." into mnc-dev 2015-06-23 20:58:34 +00:00
Jeff Davidson
8d9ad19341 Merge "Default permissions for carrier apps." into mnc-dev 2015-06-23 20:43:06 +00:00
Adam Lesinski
06f46cb320 Extend the time between WiFi energy samples
With bursty WiFi traffic, we end up sampling the WiFi controller's
energy data quite a lot. Extend the timeout so that we sample
once there has been no activity for 15 seconds.

Note: Once the WiFi radio goes down after being active, it can come back and be
active in less than 15 seconds, which means we may sample twice quickly.

Bug:21478443
Change-Id: I99081b664f8a33fef734bc55eef4d33ac297e83a
2015-06-23 13:42:53 -07:00
Chris Wren
f1b25bd434 fix the build: remove duplicated line
Change-Id: I0ae6443dd7237b8cce14d12967edd0afb8d34196
2015-06-23 16:28:33 -04:00
Chris Wren
72e7230b90 Merge "collect more stats about the notification API" into mnc-dev 2015-06-23 19:56:21 +00:00
Ruben Brunk
323b768d6d Merge "Ensure camera service is notified of user profile changes." into mnc-dev 2015-06-23 19:48:23 +00:00
Ruben Brunk
a59a8707ea Ensure camera service is notified of user profile changes.
Bug: 21996939
Change-Id: Ie2578c4de587d26090f46b15e958ab9820f0ccf7
2015-06-23 12:47:08 -07:00
Amith Yamasani
862ab87bda Merge "Runtime permissions cannot be set on legacy apps by device policy" into mnc-dev 2015-06-23 19:43:41 +00:00
Paul Jensen
9065b81016 Merge "Disallow requesting networks with mutable NetworkCapabilities." into mnc-dev 2015-06-23 19:40:38 +00:00
Paul Jensen
28dd8c4a29 Merge "Fix missing NetworkCallbacks for NET_CAPABILITY_VALIDATED changes" into mnc-dev 2015-06-23 19:40:21 +00:00
Paul Jensen
dafd561298 Merge "Add NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL" into mnc-dev 2015-06-23 19:40:02 +00:00
Amith Yamasani
0bf8f7cc39 Runtime permissions cannot be set on legacy apps by device policy
Clarify docs that runtime permissions can be granted or revoked by
a profile owner/device owner only for MNC apps and not legacy apps.

Check the targetSdkVersion and return false if legacy app.

Remove all policy flags from permissions when cleaning up
a device or profile owner.

Bug: 21835304
Bug: 21889278
Change-Id: I4271394737990983449048d112a1830f9d0f2d78
2015-06-23 12:01:36 -07:00
Todd Kennedy
c293d3ad1a Skip upgrade keys for adopted storage
Define a new scan flag to control whether or not we're performing
an initial scan for packages. On internal storage, an intial
scan occurs during every boot. For adopted storage, an intial scan
occurs immediately after the adopted volume is mounted or whenever
an application is moved.

Bug: 21815906
Change-Id: Ieda9668230597346bce9ee25ecfa204f931bcef6
2015-06-23 11:47:19 -07:00
Chris Wren
93abac48bb collect more stats about the notification API
3.5 times as many bytes, at 1/4th the frequency, so a net reduction
in log size, although it'll seem like an increase due to being bursty
and therefore more noticable.

Bug: 21530763
Change-Id: Icb1a1a1b0dcd4fd8b3c24f317d39b38f1591757e
2015-06-23 18:38:37 +00:00
Xiaohui Chen
a2c159fede Merge "system_server: optimize app idle parole state change" into mnc-dev 2015-06-23 18:23:36 +00:00
Paul Jensen
bb2e0e9816 Disallow requesting networks with mutable NetworkCapabilities.
It's not clear what it means to request a network with a mutable
NetworkCapability like NET_CAPABILITY_VALIDATED or
NET_CAPABILITY_CAPTIVE_PORTAL.  Presently requesting such a network
would fail in a number of different ways:
1. The NetworkFactories would fail to match the request against their
   filter which doesn't include stateful NetworkCapabilities.
2. If the NetworkFactories did match, they'd bring up networks to try
   and satisfy the requests, but the networks would not have any
   mutable NetworkCapabilities initially so they'd be reaped.
Because of these problems it's safest to simply disallow these
requests.

Bug: 21343774
Change-Id: I56303242b81d39b370b8d5d1e32059bfcfc25949
2015-06-23 14:13:10 -04:00
Paul Jensen
1c7ba0285b Fix missing NetworkCallbacks for NET_CAPABILITY_VALIDATED changes
Without this fix if a listening NetworkRequest with NET_CAPABILITY_VALIDATED
is submitted after a network has been validated but failed the most recent
validation attempt, the NetworkRequest will never receive callbacks.

Bug: 21343774
Change-Id: I6fa6d563c9a6f278b20e645776b707559033b249
2015-06-23 14:11:44 -04:00
Paul Jensen
3d194eae6f Add NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL
Bug: 21343774
Bug: 20898908
Change-Id: I23069a6cba346999d1b2eeaa445023bd6bf4ef94
2015-06-23 14:09:01 -04:00
Jeff Davidson
2a88031208 Default permissions for carrier apps.
Grant permissions in the PHONE and LOCATION buckets to default carrier
apps as defined by the telephony stack. Provide a system API to grant
default permissions for carrier apps, as the set of apps may change
when a new SIM is inserted.

Since the phone process is separate from the system process, we need
to allow for binder calls to these APIs.

Also fix a log tag that is too long (android.util.Log drops messages
silently if the tag is > 23 characters).

Bug: 21696731
Change-Id: I98ca0c49c69f621f835ba57c1fd0505f2cec0d0d
2015-06-23 09:55:23 -07:00
Wale Ogunwale
f5ad42f432 Update surfaces secure flag on screen capture setting change
Also, added 'wm screen-capture [userId] [true|false]'
command.

Bug: 20934462
Change-Id: I14711003d7691fc4495428c12c9ff3457cd3773c
2015-06-23 09:08:29 -07:00
Chris Wren
ca7febf4b8 Merge "add rank to notification visibility log" into mnc-dev 2015-06-23 12:43:09 +00:00
Zoltan Szatmary-Ban
2c3c66a2cf Merge "Introduce Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN" into mnc-dev 2015-06-23 08:44:49 +00:00
Bart Sears
1ef23adef8 Merge "Revert "Remove not needed contacts related perissions."" into mnc-dev 2015-06-23 06:18:20 +00:00
Bart Sears
ed5ff51b2c Revert "Remove not needed contacts related perissions."
Broke the build, reverting.

This reverts commit a2991da0d6.

Change-Id: I2bdfa70fbd8a6c03e48426f85eeb63896762d5da
2015-06-23 06:16:25 +00:00
Svet Ganov
2b5bec9356 Merge "Remove not needed contacts related perissions." into mnc-dev 2015-06-23 04:00:06 +00:00
Svet Ganov
d669321276 Merge "Auto grant read external storage too - it is now dangerous." into mnc-dev 2015-06-23 03:52:13 +00:00
Svet Ganov
975fa474a7 Auto grant read external storage too - it is now dangerous.
We grant external storage permissions to some default handlers by
default. Read external storage was promoted to runtime permission
but was not granted as a part of the external storage group, i.e.
with write external storage.

bug:21980225

Change-Id: I1edd7ae13222f12c9a488efb1919f5cf96e4b69d
2015-06-22 20:45:38 -07:00
oleksii stepanian
3f4c7e3f7e Send installerUid for verification when using PackageInstaller.
PackageManagerService when used by PackageInstaller
(installStage) does not send calling installer process id.
As a result Play Store application always triggers verification
of packages that are installed.
This causes unnecessary work on the UI thread for each new
install/update.

Bug: 22014920
Change-Id: I8cc9ba7b6fcbe26ee709a5dda284e6cdd11071f1
2015-06-22 19:35:42 -07:00
Jeff Brown
5869363b06 Merge "Suppress pausing activities when screen off due to proximity." into mnc-dev 2015-06-23 02:35:14 +00:00
Jeff Brown
e1633addd3 Suppress pausing activities when screen off due to proximity.
Pausing and resuming the in-call activity may have the side-effect
of releasing and reacquiring the proximity sensor wake lock which can
cause the system to enter a loop.

Although in general it might be a good idea to pause activities
whenever you can't see them, it makes more sense to treat the proximity
sensor as temporarily suppressing rather than fully pausing activities.

Bug: 21932251
Change-Id: Ie072cbe5984bec08f2c60c64ed8cc144534982db
2015-06-22 19:32:52 -07:00
Christopher Tate
6d2268a576 Merge "Back up / restore default app and intent filter verification state" into mnc-dev 2015-06-23 01:02:12 +00:00
Christopher Tate
6038d15cbc Back up / restore default app and intent filter verification state
For apps not present on device, the state inherited from the ancestral
device is applied when the app is ultimately installed.

Bug 20144515

Change-Id: Ie05b4f1751357fc62f14e259da174b8cf465e913
2015-06-22 17:20:26 -07:00
Dianne Hackborn
0b50e56c07 Merge "Fix issue #21753257: Stability: startActivity asks to run as user 0..." into mnc-dev 2015-06-22 23:55:12 +00:00
Robin Lee
58e706d754 Merge "Let device owners handle onChoosePrivateKey" into mnc-dev 2015-06-22 23:51:02 +00:00
Nicolas Prevot
3ab6f9e691 Merge "Allow cross-profile app linking from work to personal." into mnc-dev 2015-06-22 23:18:32 +00:00
Xiaohui Chen
8dca36dc8a system_server: optimize app idle parole state change
Currently when app idle parole state changes, all idle apps' states
are updated one by one including firewall modifications which are
very expensive.  This optimization gets rid of individual firewall
rule changes and makes sure we only modify the firewall once at child
chain level.

BUG: 21446713
Change-Id: Iafc415fe0bc127826fe17894d4fedcf1755cb17d
2015-06-22 15:35:19 -07:00