2201 Commits

Author SHA1 Message Date
destradaa
eccc5480a6 am e2383800: am 607d3271: Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev
* commit 'e23838004e5db510c6e86919b2dcf16e67e3339b':
  Fix exceptions in ActivityRecognition platform stack.
2014-07-17 23:48:08 +00:00
Andres Morales
f9f7474687 am 77bf359b: am e9f27df7: Permit settings to "wipe" the persistent partition
* commit '77bf359b2d6b81fc18efe9ab888699df27ab81f9':
  Permit settings to "wipe" the persistent partition
2014-07-17 23:47:52 +00:00
Craig Mautner
68ad9d762d am 64dc5b09: am 20b338d9: Merge "Restore calling identity before checking permission" into lmp-dev
* commit '64dc5b09f1d398541486dd7beb777c71c1a4f0ec':
  Restore calling identity before checking permission
2014-07-17 21:29:32 +00:00
Amith Yamasani
74b5b4005b am 562b7f0d: am 56e7c4ef: Merge "Split telephony restrictions into outgoing calls and sms" into lmp-dev
* commit '562b7f0d1373404682e35bd37c99907d3d94e29a':
  Split telephony restrictions into outgoing calls and sms
2014-07-17 20:59:12 +00:00
Jeff Sharkey
33e5a6be31 am 37f7e245: am 375d5b90: Merge "Support cluster-style installs for bundled apps." into lmp-dev
* commit '37f7e24584b0a85adc6d699818e3e863c261e4ed':
  Support cluster-style installs for bundled apps.
2014-07-17 20:58:31 +00:00
Craig Mautner
25dd00a519 am 73c69b27: am c2d339a6: Merge "resolved conflicts for merge of 0a931069 to lmp-dev" into lmp-dev
* commit '73c69b2727b311d12f1ca8ad197db7cbe83d162c':
  Additional cleanup after stack deletion.
2014-07-17 20:58:17 +00:00
Craig Mautner
1e4603547a am 96de06e6: am b1c0b008: Merge "resolved conflicts for merge of 75f31740 to lmp-dev" into lmp-dev
* commit '96de06e63e63fa66c4c5b419164c74b512d00ae8':
  Wait for all windows to draw before turning screen on
2014-07-17 20:57:42 +00:00
Alexandra Gherghina
02e130fccf am 14b5a9b4: am dbfd0744: Ads per-user APIs to manage accounts through the AccountManager
* commit '14b5a9b452d8b47617f5d908778caaf745527fe9':
  Ads per-user APIs to manage accounts through the AccountManager
2014-07-17 20:57:31 +00:00
Kenny Guy
a44b14da0c am 0dfd3e04: am 41482465: Merge "Allow app restrictions for uninstalled packages." into lmp-dev
* commit '0dfd3e04f5da364e3500d3848ba3d21b3215716e':
  Allow app restrictions for uninstalled packages.
2014-07-17 20:57:19 +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
6ccb5f894e Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev 2014-07-17 18:11:21 +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
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
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
Torne (Richard Coles)
cf04fc99c2 am 8829ffe0: am 07119f4a: Use the WebView\'s loader library to load the real library.
* commit '8829ffe031d612248a1a02d89e923f4c6c947fb0':
  Use the WebView's loader library to load the real library.
  Remove WebView library preloading mechanism.
2014-07-17 17:07:04 +00:00
Kenny Guy
1887a0781e am bad2ccf9: am 6ec1e21d: Merge "Check for exported and category before starting activity." into lmp-dev
* commit 'bad2ccf92776fd19c042ef76d0415fdee2f06bef':
  Check for exported and category before starting activity.
2014-07-17 17:06:34 +00:00
Nicolas Prevot
1423ab75a4 am a2a8501e: am 9a4cf569: DO NOT MERGE
* commit 'a2a8501ed552ec2c7679f079b2118a6eed2827ac':
  DO NOT MERGE
2014-07-17 17:05:55 +00:00
Dianne Hackborn
ec18364c7b am 68f35ec2: am dbec91c0: Implement issue #16330060: Inform ActivityManager about WebView...
* commit '68f35ec2d2f9950f57afa9900f16a3b29a8d55b0':
  Implement issue #16330060: Inform ActivityManager about WebView...
2014-07-17 17:05:26 +00:00
John Spurlock
df3ef4fb1e am 11d850c1: am efe8514f: Merge "Update data limit notification icon + strings." into lmp-dev
* commit '11d850c11157aab9804d28169f9c72cca431fc1e':
  Update data limit notification icon + strings.
2014-07-17 17:05:05 +00:00
John Spurlock
18a49791fa am 7aeea625: am 45aebdf2: Merge "Add a zen-specific event sink, include in dumpstate." into lmp-dev
* commit '7aeea625a5cd90de691c9037310553f14eb73560':
  Add a zen-specific event sink, include in dumpstate.
2014-07-17 17:04:57 +00:00
Amith Yamasani
33721c1143 am d63203df: am b31b07c8: Merge "Allow content provider access across users" into lmp-dev
* commit 'd63203dfa38bf1b40ba976bfad1e9fcfeb761ddf':
  Allow content provider access across users
2014-07-17 17:04:53 +00:00
Jungshik Jang
a9f9992d7b am d26e2a0c: am 6d98d91f: Merge "Hook up system audio mode" into lmp-dev
* commit 'd26e2a0cc786608f4cb88213202f8424e29e7e9e':
  Hook up system audio mode
2014-07-17 17:04:23 +00:00
Dianne Hackborn
1da67f0cb4 am d8f0526c: am 8b353ef1: Merge "Maybe fix issue #16167054: Wakelock is acquired and released in..." into lmp-dev
* commit 'd8f0526c252b142faffddf035b3d32d35f39e7bf':
  Maybe fix issue #16167054: Wakelock is acquired and released in...
2014-07-17 17:04:19 +00:00
Robert Greenwalt
551a327424 am 004a427e: Merge "Make a network the default when it connects if we have no default." into lmp-dev
* commit '004a427e630e1db09df00e8f826627f919183c89':
  Make a network the default when it connects if we have no default.
2014-07-17 17:01:54 +00:00
Stuart Scott
dd718ab5d6 am b8948923: Merge "MSIM: dump sub specific info" into lmp-dev
* commit 'b8948923b3f5eaf2eac96788294bc8c82cf0cfa9':
  MSIM: dump sub specific info
2014-07-17 16:58:55 +00:00
Jeff Sharkey
1f095c10f0 am 2158503f: Merge "Install sessions only inherit APK files." into lmp-dev
* commit '2158503ff835f60d1a39f5bac724dd90e0900403':
  Install sessions only inherit APK files.
2014-07-17 16:58:30 +00: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
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
Craig Mautner
45374c9afa Merge "resolved conflicts for merge of 75f31740 to lmp-dev" into lmp-dev 2014-07-17 16:16:48 +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
RoboErik
d35858662c am b21fab77: Merge "Change adjustVolumeBy to adjustVolume" into lmp-dev
* commit 'b21fab77c0758da3dcb2fa0029fef92df4d5902a':
  Change adjustVolumeBy to adjustVolume
2014-07-17 14:02:50 +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
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
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
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
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
Kenny Guy
78fd9d6b36 Merge "Check for exported and category before starting activity." into lmp-dev 2014-07-17 00:09:54 +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
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
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
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
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