18486 Commits

Author SHA1 Message Date
Christopher Tate
5f7f252b45 Properly end full restore attempt if getNextFullRestoreDataChunk() fails
Don't just drop the error return on the floor and retry (forever!).

Change-Id: I5f0ef2d09ea286d813add69517f865e474341b43
2014-07-17 23:01:04 +00:00
Michael Wright
c7a845de4a Merge "Add MediaProjection APIs." into lmp-dev 2014-07-17 21:15:46 +00:00
Michael Wright
c39d47a8e7 Add MediaProjection APIs.
The new MediaProjection infrastructure allows the system to hand out
tokens granting the ability to capture the screen's contents, audio,
etc. at a granular level. It's intended to be used both for screen
casting, via the cast APIs, as well as screen sharing via third party
applications.

The screen sharing case is implemented, but all of audio capturing
is still forthcoming.

Change-Id: I4b24669bed7083e11413c10ed8d6b025f5375316
2014-07-17 14:30:19 -07:00
Ben Murdoch
dc00a84af1 Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast.
This allows the WebViewUpdateService to receive notifications that
an update has been installed and we need to trigger recreation of
the relro file.

bug: 16329377
Change-Id: I088e61487416add997995db304beca0cde71390c
2014-07-17 21:18:40 +00:00
destradaa
6ccb5f894e Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev 2014-07-17 18:11:21 +00:00
Andres Morales
963295ea10 Permit settings to "wipe" the persistent partition
One of the requirements is that when the user does a
factory reset through settings, all data on the
persistent partition should be cleared.

This adds one last API method that allows settings
to wipe the partition.

Bug: 14288780
Change-Id: Ib87ee741d1e5195814516ae1d66eb7c4cf754dcf
2014-07-17 20:42:04 +00:00
destradaa
3b0224dc3c Fix exceptions in ActivityRecognition platform stack.
b/16348349

Change-Id: I1f85283c86130b86389a1be7da49904658b0558c
2014-07-17 11:09:46 -07:00
Jeff Sharkey
69eef8a0d2 Merge "Support cluster-style installs for bundled apps." into lmp-dev 2014-07-17 18:05:14 +00:00
Jeff Sharkey
1e9189a276 Support cluster-style installs for bundled apps.
Bug: 16319961
Change-Id: I499b904dfd56f236a1b574c29a44272ed814be0f
2014-07-17 11:07:12 -07:00
Sandeep Siddhartha
f8cf71d753 Support model deletion
the updateKeyphrase call is also used to clear out a sound model currently,
this happens when the sound model passed in has no keyphrases.

We can revisit if we need another deleteSoundModel method

- Also fix an issue with the way we were writing keyphrase to the DB
  and when updating keyphrase, we actually addOrUpdate

Change-Id: Ib7250c2fdafef6bc40387912a79366c334d73292
2014-07-17 11:01:25 -07:00
Craig Mautner
b3325cbb26 Merge "resolved conflicts for merge of 0a931069 to lmp-dev" into lmp-dev 2014-07-17 16:16:48 +00:00
Craig Mautner
aa9b0f1575 resolved conflicts for merge of 0a931069 to lmp-dev
Conflicts:
	services/core/java/com/android/server/am/ActivityManagerService.java
	services/core/java/com/android/server/am/ActivityStackSupervisor.java

Change-Id: I68e8290566b51fadb5671abdd9d05faf28502e22
2014-07-17 10:50:18 -07:00
Justin Koh
0a93106964 am 65d7c332: Merge "Additional cleanup after stack deletion." into klp-modular-dev
* commit '65d7c332d7b613f23a26066051cc7496e0efa994':
  Additional cleanup after stack deletion.
2014-07-17 10:56:16 +00:00
Justin Koh
75f317403f am 77cdac05: Merge "Wait for all windows to draw before turning screen on" into klp-modular-dev
* commit '77cdac05ba80925f6cdc4c349af0fa7567c36146':
  Wait for all windows to draw before turning screen on
2014-07-17 10:55:56 +00:00
Craig Mautner
e2e280ec59 Merge "Restore calling identity before checking permission" into lmp-dev 2014-07-17 17:59:02 +00:00
Craig Mautner
85c11a8831 Restore calling identity before checking permission
Using the system service identity to check the CHANGE_CONFIGURATION
permission isn't likely to catch a security violation. Changing
back to the original caller and then checking permissions is
preferred.

Fixes bug 16215650.

Change-Id: Iff08d04422bcc052a487194154f1fd0d727d38f4
2014-07-17 12:38:18 -07:00
Amith Yamasani
bb4d6a20bd Merge "Split telephony restrictions into outgoing calls and sms" into lmp-dev 2014-07-17 02:34:24 +00:00
Amith Yamasani
390989da19 Split telephony restrictions into outgoing calls and sms
DISALLOW_TELEPHONY renamed to DISALLOW_OUTGOING_CALLS and introduced
DISALLOW_SMS.

Outgoing emergency calls should always be permitted.

Change-Id: I0a38ef6e2df9dcf62d16fd93622ad61f4327614f
2014-07-17 12:14:52 -07:00
Adam Connors
c8fa3ae2ce Merge "Create DPM APIs for cross profile callerId" into lmp-dev 2014-07-17 00:15:07 +00:00
Adam Connors
210fe21e95 Create DPM APIs for cross profile callerId
Contact information in the managed profile is shown
in the incoming call UI unless blocked using this API.

TODO: Actually plumb this into the caller-id logic.

Bug: 16301261
Change-Id: If03adc907d9558baa0a45a1833b857206b7bf96a
2014-07-17 16:28:52 +01:00
Craig Mautner
45374c9afa Merge "resolved conflicts for merge of 75f31740 to lmp-dev" into lmp-dev 2014-07-17 16:16:48 +00:00
Alexandra Gherghina
999d394ade Ads per-user APIs to manage accounts through the AccountManager
Bug: 16056552
Bug: 14642886
Change-Id: I17ff6c2515285e63c84cecf2f861d10666c393c5
2014-07-17 17:08:49 +00:00
Craig Mautner
efc81e7d5e resolved conflicts for merge of 75f31740 to lmp-dev
Conflicts:
	services/core/java/com/android/server/wm/WindowManagerService.java

Change-Id: Ifdfe253c4b3410a6000fd5a7cdcd785adc80a47b
2014-07-17 10:05:07 -07:00
Amith Yamasani
3f4f2fbcd0 Merge "Keep track of user_setup_complete in DPMS" into lmp-dev 2014-07-17 16:16:48 +00:00
Amith Yamasani
ed239cb950 Keep track of user_setup_complete in DPMS
This is to ensure that some system app can't modify that
state for purposes of changing the profile owner without
user consent.

Bug: 16207721

Change-Id: Ic5f454d7568cd824b83456eed0e2611779a9adf8
2014-07-16 20:36:41 -07:00
Christopher Tate
2e40d115ca Add BackupAgent.onRestoreFinished() callback
The agent's onRestoreFinished() method is called after all available
data has been delivered to the app, whether via the key/value restore
API or the full-data file-at-a-time API.  This gives the app a stable
opportunity to do any postprocessing that might be appropriate.

Also fixes a lingering bug in the framework's handling of backup
agent lifetimes.  In cases where an existing agent instances was
being rebound, the framework was forgetting to notify the dependent
that the agent was available.  This was causing timeouts and restore
failure.

Bug 16241004

Change-Id: I3f52b299312d30d38b0cba63a2cfaeb934991ef2
2014-07-17 17:43:24 +00:00
Kenny Guy
f05b231485 Merge "Allow app restrictions for uninstalled packages." into lmp-dev 2014-07-17 00:09:54 +00:00
Kenny Guy
d21b218139 Allow app restrictions for uninstalled packages.
Stop cleaning up app restrictions for packages
that aren't installed.
Remove app restriction file if restrictions is
set to an empty or null bundle.
All user types may now have restrictions if a
profile or device owner is present.

Bug: 15565914
Change-Id: I55f38ca0ad7794b9fc2967113973dc035a416558
2014-07-17 17:00:33 +01:00
Dianne Hackborn
fee756ff91 Implement issue #16330060: Inform ActivityManager about WebView...
...state changes.

Add a new API to tell the activity manager about a new dependency
one process has on another package.  Start using it already for
when apps is Context.createPackageContext() to load code from another
app.

Also do some work on getting the monitoring of proc/uid states
in shape so it can be used by unundled code, along with an
AppImportanceMonitor class for doing so.

Some small fixes and additions to VoiceInteractionService.

Improve handling of unaccounted/overcounted battery use so that
they aren't shown to the user unless they are significant.

Change-Id: I22dd79a73f4e70103d3f8964494aebc8a31f971c
2014-07-16 22:50:31 -07:00
Sandeep Siddhartha
2883ba6975 Plumb the database code to read/update sound models
Change-Id: I135131b042481462f905bdb69ea8544e2561d177
2014-07-16 22:10:45 -07:00
Torne (Richard Coles)
08cfaf6726 Use the WebView's loader library to load the real library.
Load libwebviewchromiumloader and use it to load the real WebView
library, to enable sharing of the relro segment between different
application processes without requiring that the library be preloaded in
the zygote. A system service is added to track whether the relro segment
file has been prepared, and block loading of the library until it has
been.

Bug: 13005501
Change-Id: I846b37c7b8e2a4eb8a39e4fd455bccbb2048c173
2014-07-17 09:18:43 -07:00
Kenny Guy
78fd9d6b36 Merge "Check for exported and category before starting activity." into lmp-dev 2014-07-17 00:09:54 +00:00
Nicolas Prevot
e702404c5a DO NOT MERGE
Remove cross-profile intent filters when removing a user.

When a user is being removed: removing cross-profile intent filters that have
this user as their source.
This makes sure that if the user id gets reassigned without restarting the phone,
we do not have old information from the preexisting profile.

Change-Id: Ie3a2aa0cbbe6c9eb9e945e650fd907e5cc012409
(cherry picked from commit d44e2d7340c70406d8b5eb8b3d6c6c0daaa8705f)
2014-07-17 13:44:56 +00:00
Kenny Guy
2df1892f41 Check for exported and category before starting activity.
Make LauncherAppService check that component passed to
startActivityAsUser is exported and has the category
Intent.CATEGORY_LAUNCHER before starting it.

Bug: 15989072
Change-Id: I29d03fae49ff0ca8d7f7524f5e71895d62ff3cae
2014-07-17 12:14:13 +00:00
Justin Koh
65d7c332d7 Merge "Additional cleanup after stack deletion." into klp-modular-dev 2014-07-16 22:30:55 +00:00
Craig Mautner
0a589b929e Wait for all windows to draw before turning screen on
Was previously only waiting for windows on the primary display to
draw which meant that windows on ActivityViews had not yet drawn.
This fix checks redraws all outstanding Surfaces before unblanking
the screen.

Fixes bug 15092354.

Change-Id: Id550db003a5f56931eb68464085596e47d25481d
2014-07-16 17:03:36 -07:00
Craig Mautner
ee36c77acd Additional cleanup after stack deletion.
- Remove activity from PendingActivityLaunch list when it is removed
from stack. This prevents the delayed launch causing
IllegalArgumentException in b/16045752.
- Move PendingActivityLaunch from ActivityManagerService to
ActivityStackSupervisor.
- Immediately call onTaskListEmptyLocked() in cases where no
activities are found in stack.

Fixes bug 16045752.

Change-Id: Ia69a449e7f5e08ab6e36157d0fd793c4d2fdaca4
2014-07-16 15:03:11 -07:00
John Spurlock
aedebda776 Update data limit notification icon + strings.
- Use a more specific disabled cellular data icon.
- Reword framework strings to use "Cellular" instead of "Mobile"
  and avoid "enabled/disabled"
- Update SystemUI's network limit dialog to follow suit.

Bug:16185238
Change-Id: Ie9191990fab17cd7dc04395fad39f84bfff8349d
2014-07-16 23:32:44 -04:00
John Spurlock
1375e73ed8 Merge "Add a zen-specific event sink, include in dumpstate." into lmp-dev 2014-07-16 21:59:11 +00:00
John Spurlock
6ae82a747c Add a zen-specific event sink, include in dumpstate.
Useful for tracking zen events (since boot) that are
too old to be included in the standard log.

Change-Id: I91633d35b26091bb18523a76ebdba9d286d0cd41
2014-07-16 21:44:17 -04:00
Amith Yamasani
9034620dd5 Merge "Allow content provider access across users" into lmp-dev 2014-07-16 23:42:05 +00:00
Amith Yamasani
ebf1fd99d6 Allow content provider access across users
If the package has INTERACT_ACROSS_USERS. This had recently
regressed. Bringing back the functionality needed for multiuser
call log syncing.

Bug: 16298776
Change-Id: I4fdc3d676bb8a2bf78f5c27c41a74c0491e343cd
2014-07-16 17:47:40 -07:00
Chris Craik
889fc94ffa Merge "Add accessibility text contrast setting" into lmp-dev 2014-07-16 21:54:23 +00:00
Chris Craik
cce47eb580 Add accessibility text contrast setting
b/14624452

Adds a feature which draws all text (in the HW accelerated standard
path) in a high contrast mode. Text is drawn at full alpha, and either
white or black (depending on its original color) with a starkly
contrasted outline beneath it.

Change-Id: I943f624b6367de35367cced3b2a8298f2bc62377
2014-07-16 18:25:23 -07:00
Jungshik Jang
bcc0eae1dc Merge "Hook up system audio mode" into lmp-dev 2014-07-16 23:30:53 +00:00
Jungshik Jang
377dcbd53a Hook up system audio mode
Whenever system audio mode is changed, it should notify to AudioManager
so that AudioManager changes internal output or mute status accordingly.
To have more clear cut between last setting and current system audio mode,
renamed mSystemAudioMode into mSystemAudioActivated and added
getLastSystemAudioMode() which returns last system audio mode value stored
in global settings (NVM).

Bug: 16002150
Change-Id: I5d01d879c1c5a9a3f4b0cf2d25e9e74c26c52fa0
2014-07-17 10:12:14 +09:00
Dianne Hackborn
0d192a9e27 Maybe fix issue #16167054: Wakelock is acquired and released in...
...battery history even though CPU is in suspend

There is a race in the power manager between noting a wake lock
acquire and ensuring the device is staying awake.

Change-Id: I3d76f99d73dca119b09f253f0e31448408c88a3c
2014-07-16 17:51:06 -07:00
Paul Jensen
27b02b7aba Make a network the default when it connects if we have no default.
When a network comes online, is a candidate for being the default network
(i.e. satisfies default NetworkRequest), and the device has no default
network, then make the new network the default network for the purposes
of routing network traffic.  This does not affect NetworkRequests or
NetworkCallbacks.  This ignores but does not affect network validation.

Benefits:
1. Offers a fail-safe in case network validation returns a false negative.
   For example:  It would be nice if every Android device didn't fail when
   clients3.google.com/generate_204 went down.
2. Offers a method to debug connectivity issues.
   For example:  If WiFi is failing, disabling Cellular would rule out
   interference from WiFi network validation.
3. Reduces delay between no connectivity and any connectivity.
4. Offers a fail-safe in cases of unreliable networks.
   For example: You need rescuing from a remote location with a weak signal
   offering 90% packet loss.  You just want your distress call to go out
   but are infuriated to find network validation blocks connectivity.

Change-Id: I78621a1fe8ed2a336591f65bf7b07a6cbcc7ba5e
2014-07-16 16:12:16 -07:00
Stuart Scott
7c673820d7 Merge "MSIM: dump sub specific info" into lmp-dev 2014-07-16 02:34:24 +00:00
Sandeep Gutta
2f32ac25e9 MSIM: dump sub specific info
Add support to dump subscription specific info
in TelephonyRegistry.

Clean cherrypick from partner repo.

Change-Id: I8f9471ef76de95f96943b3d89156a2fc1a041360
2014-07-16 14:09:48 -07:00