Amith Yamasani
dbf29fa5dd
am 77d9f308: am 427dccc0: Merge "Fix build part 2" into jb-mr1-dev
...
* commit '77d9f308c0b9356b5df411c6debcdbec7fc0464b':
Fix build part 2
2012-08-17 17:12:47 -07:00
Amith Yamasani
fc6e0ca07e
Fix build part 2
...
Change-Id: I3b4ed430f214468a22d3b3aaf3605e570cfd0ed1
2012-08-17 17:07:14 -07:00
Amith Yamasani
56f4a67250
am 539d2b56: am 7fdaa397: Merge "Save preferred activity info with user id." into jb-mr1-dev
...
* commit '539d2b562fa1aa8afc4c3e98209e8b4f6ab56e9c':
Save preferred activity info with user id.
2012-08-17 16:23:20 -07:00
Amith Yamasani
7fdaa3976d
Merge "Save preferred activity info with user id." into jb-mr1-dev
2012-08-17 16:19:19 -07:00
Amith Yamasani
44a9d4b6df
am f4dbcb64: am 029675e5: Merge "Fix launching activity from a pending intent" into jb-mr1-dev
...
* commit 'f4dbcb6459cb3cc5a4461b4510a9e1083307c081':
Fix launching activity from a pending intent
2012-08-17 15:58:14 -07:00
Amith Yamasani
029675e5ad
Merge "Fix launching activity from a pending intent" into jb-mr1-dev
2012-08-17 15:54:18 -07:00
Nick Pelly
aa07155966
am 5dd7b11e: am 2b7a0d00: Fix addGeofence() and addProximityAlert().
...
* commit '5dd7b11eb2ba2213cc04799ffd3943508b8e0a02':
Fix addGeofence() and addProximityAlert().
2012-08-17 15:40:00 -07:00
Nick Pelly
fc93d772de
am a44590f3: am 4035f5a7: Port location blacklist code to MR1.
...
* commit 'a44590f3f9d97ac60fab64aa0fa867d0c588b48f':
Port location blacklist code to MR1.
2012-08-17 15:38:19 -07:00
Nick Pelly
2b7a0d0042
Fix addGeofence() and addProximityAlert().
...
Need to clear the callers identity before calling into geofence manager
because it in turn calls fused location API's.
Change-Id: I7993b0b8b2a947ff93c37a7c9d29ca0e7c95f9a8
2012-08-17 15:25:21 -07:00
Nick Pelly
4035f5a7c1
Port location blacklist code to MR1.
...
I had to re-do this change for MR1 because LocationManagerService changed
so much. Here is the original change description:
Add package-name-prefix blacklist for location updates.
The Settings.Secure value locationPackagePrefixBlacklist and
locationPackagePrefixWhitelist contains comma seperated package-name
prefixes.
Location & geo-fence updates are silently dropped if the receiving
package name has a prefix on the blacklist. Status updates are
not affected. All other API's work as before.
A content observer is used so run-time updates to the blacklist
apply immediately. There is both a blacklist and a whitelist.
The blacklist applies first, and then exemptions are allowed
from the whitelist. In other words, if your package name prefix
matches both the black AND white list, then it is allowed.
Bug: 6986553
Change-Id: I1e151e08bd7143e47db005bc3fe9795076398df7
2012-08-17 15:25:16 -07:00
Amith Yamasani
7300dbeba0
Fix launching activity from a pending intent
...
The creator of the pending intent is the user on which the activity
should be launched.
Change-Id: I733326ed8a5784985ac93a84ce91de4dda17c730
2012-08-17 14:19:57 -07:00
Amith Yamasani
386f37f6b2
am 2bb9b562: am 81c304b9: Merge "Send USER_SWITCHED with the correct permission" into jb-mr1-dev
...
* commit '2bb9b5620bfa02dbe6d611c1e0acb1d1849cc384':
Send USER_SWITCHED with the correct permission
2012-08-17 14:03:19 -07:00
Amith Yamasani
81c304b99d
Merge "Send USER_SWITCHED with the correct permission" into jb-mr1-dev
2012-08-17 13:58:17 -07:00
Amith Yamasani
1ab36c1d83
Send USER_SWITCHED with the correct permission
...
Forgot to change this from MANAGE_ACCOUNTS to MANAGE_USERS.
Change-Id: Ib07d2ac84c19cef278a0e564676b6200e0f97dd1
2012-08-17 13:55:02 -07:00
Amith Yamasani
a3f133afe8
Save preferred activity info with user id.
...
So each user can have their own set of intent resolution preferences.
ResolverActivity now launches the activity on the correct user, and
persists the preference for the correct user.
Bug: 6961905
Change-Id: I6d3a8a9af89bc649277d4fc8d0f367ee123f8392
2012-08-17 13:32:02 -07:00
Michael Jurka
4a2efa1a6e
am 76070ed3: am d2ae85d4: Merge "Adding a thumbnail scale down animation" into jb-mr1-dev
...
* commit '76070ed39749917efdd15be738f6172959b69acd':
Adding a thumbnail scale down animation
2012-08-17 13:08:09 -07:00
Michael Jurka
d2ae85d41e
Merge "Adding a thumbnail scale down animation" into jb-mr1-dev
2012-08-17 13:03:15 -07:00
Nick Pelly
240c53b7da
am 74bd6670: am aeca6898: Merge "Fix regression from location changes: GPS battery tracking." into jb-mr1-dev
...
* commit '74bd6670f8c3d902ab23918f79d4a637d66cd170':
Fix regression from location changes: GPS battery tracking.
2012-08-17 12:02:14 -07:00
Nick Pelly
aeca689804
Merge "Fix regression from location changes: GPS battery tracking." into jb-mr1-dev
2012-08-17 11:57:52 -07:00
Nick Pelly
f2033e473a
Fix regression from location changes: GPS battery tracking.
...
The client UID list wasn't being saved, so we never removed
client UID's. As a result apps get blamed for GPS even when
they are no longer using it.
Bug: 7007314
Change-Id: Idff3b7c8c0ee87b99c9bdd7bd20d8391d0b1ac0f
2012-08-17 11:56:39 -07:00
Dianne Hackborn
7066aafa13
am 73c4e53f: am 79af1dd5: Switch public APIs to use new UserHandle class for identifying users.
...
* commit '73c4e53f0febb7ac0b454a15180ad0810950d6fe':
Switch public APIs to use new UserHandle class for identifying users.
2012-08-17 11:47:38 -07:00
Dianne Hackborn
79af1dd54c
Switch public APIs to use new UserHandle class for identifying users.
...
Gets rid of "yet another integer" confusion.
Change-Id: Id07ea7307aea7c62f0087c6663a1f1c08e2e5dee
2012-08-17 10:36:08 -07:00
Amith Yamasani
91413e745d
am 745ec38b: am 9c38d6e5: Merge "UserHandle to UserSerialNo mapping" into jb-mr1-dev
...
* commit '745ec38bdca1e86dd0093ade4a382880fda7743a':
UserHandle to UserSerialNo mapping
2012-08-17 09:24:34 -07:00
Amith Yamasani
2a00329c6d
UserHandle to UserSerialNo mapping
...
Use AtomicFile for usermanager files.
Added a MANAGE_USERS permission that apps (signature permission) can use
to create/query/modify/remove users.
Change-Id: I5cf232232d0539e7508df8ec9b216e29c2351cd9
2012-08-17 09:06:10 -07:00
Nick Pelly
f34eae6d23
am 78e9ea9c: am 1f3f128a: Merge "Add javadoc for new location API\'s." into jb-mr1-dev
...
* commit '78e9ea9c7b4cce2317a24f57cd67d74c53bd1eaf':
Add javadoc for new location API's.
2012-08-16 18:10:35 -07:00
Nick Pelly
1f3f128ad1
Merge "Add javadoc for new location API's." into jb-mr1-dev
2012-08-16 18:05:32 -07:00
Nick Pelly
4e31c4fffb
Add javadoc for new location API's.
...
Change-Id: If15024ee88421c07ba3a174747774fc451fd002e
2012-08-16 17:59:34 -07:00
Kenny Root
133c096134
am 799ee212: am 9a994b53: am 050c87f8: am a950daf5: Merge changes Ieb566a2a,I953057cd
...
* commit '799ee2127efae8e112f333c13c3da89d1d97589d':
Use Libcore's stat instead of FileUtils#getFileStatus
Use Libcore.os.stat instead of FileUtils
2012-08-16 16:48:55 -07:00
Kenny Root
9a994b5350
am 050c87f8: am a950daf5: Merge changes Ieb566a2a,I953057cd
...
* commit '050c87f87e2a48c7bc90f5b15fb6e4e37e667286':
Use Libcore's stat instead of FileUtils#getFileStatus
Use Libcore.os.stat instead of FileUtils
2012-08-16 16:43:20 -07:00
Kenny Root
050c87f87e
am a950daf5: Merge changes Ieb566a2a,I953057cd
...
* commit 'a950daf5c14a0009c2c62e9c3e0e8d51eb0cf7d9':
Use Libcore's stat instead of FileUtils#getFileStatus
Use Libcore.os.stat instead of FileUtils
2012-08-16 16:33:40 -07:00
Jeff Brown
06d4e28b9b
am d68ffb09: am 13c589b6: Animate brightness with electron beam.
...
* commit 'd68ffb09241580ce026be10be69c164d7e7ea225':
Animate brightness with electron beam.
2012-08-16 16:32:55 -07:00
Jeff Brown
13c589b66c
Animate brightness with electron beam.
...
Also added an internal flag to control whether the electron beam
on animation is used. It's on for now but we might want to
turn if off if we can't get the HAL to provide the
necessary screen on synchronization on all devices.
Change-Id: Iaa3cfa0fd61de10174e68351e4db890eff2d2918
2012-08-16 16:26:54 -07:00
Kenny Root
7abab32c00
am af101312: am 520ee7bc: am a2e8365c: am 9b0da58e: Merge "Introduce a restorecon JNI binding."
...
* commit 'af101312c880f440a2c33965e4479feaa1fd6b82':
Introduce a restorecon JNI binding.
2012-08-16 15:37:16 -07:00
Kenny Root
520ee7bcad
am a2e8365c: am 9b0da58e: Merge "Introduce a restorecon JNI binding."
...
* commit 'a2e8365cc883de0d3e56e9f4af350ecfe1b8fc4c':
Introduce a restorecon JNI binding.
2012-08-16 15:32:52 -07:00
Kenny Root
a2e8365cc8
am 9b0da58e: Merge "Introduce a restorecon JNI binding."
...
* commit '9b0da58e3a30b760de37138cdd51d20f269c383e':
Introduce a restorecon JNI binding.
2012-08-16 15:29:41 -07:00
Kenny Root
786cbcacd2
Use Libcore.os.stat instead of FileUtils
...
PackageManagerService just needed to know the owner for this file, so
just use stat instead so we can remove the old JNI code.
This is the last user of FileUtils#getPermissions so just remove the
FileUtils method as well.
Change-Id: I953057cd6b9de4410f33b6f22e4bddff02fe2988
2012-08-16 15:27:55 -07:00
Nick Pelly
744d628d38
am 3f685a53: am 60020e2f: Merge "Improve coarse locations." into jb-mr1-dev
...
* commit '3f685a5319690baf0d405943757e09f23b409f8b':
Improve coarse locations.
2012-08-16 15:27:40 -07:00
Nick Pelly
60020e2fa3
Merge "Improve coarse locations." into jb-mr1-dev
2012-08-16 15:23:11 -07:00
Nick Pelly
74fa7eabda
Improve coarse locations.
...
Fix a couple of bugs, and modify the behavior of the random offset.
The random offset now slowly changes over time, to mitigate against
applications averaging out the offset over time while at a
grid boundary.
Change-Id: Iecffff29145b8c2b30d1eca1662cf9d3e8cff756
2012-08-16 15:22:24 -07:00
Jeff Sharkey
2ed2c64c73
am 849e985e: am c584b65b: Merge "Multi-user external storage support." into jb-mr1-dev
...
* commit '849e985ea9d6869a93f7618118aa51f70dad883e':
Multi-user external storage support.
2012-08-16 14:40:10 -07:00
Kenny Root
9b0da58e3a
Merge "Introduce a restorecon JNI binding."
2012-08-16 14:38:30 -07:00
Jeff Sharkey
c584b65b20
Merge "Multi-user external storage support." into jb-mr1-dev
2012-08-16 14:32:39 -07:00
Iliyan Malchev
9919595ac3
am 6afc0e24: am ee98610f: Merge "Set the brightness to zero on screen-off" into jb-mr1-dev
...
* commit '6afc0e2437bbbafe06b22f9d61fb5763c30e69bb':
Set the brightness to zero on screen-off
2012-08-16 13:47:38 -07:00
Iliyan Malchev
ee98610f1a
Merge "Set the brightness to zero on screen-off" into jb-mr1-dev
2012-08-16 13:43:14 -07:00
Dianne Hackborn
57ccc62e87
am fe1d3d4c: am f02b60aa: Rename UserId to UserHandle.
...
* commit 'fe1d3d4c52acd5b07466e8111a6db2c596a78a7f':
Rename UserId to UserHandle.
2012-08-16 12:55:34 -07:00
Iliyan Malchev
122415f5c8
Set the brightness to zero on screen-off
...
Fixes b/6996990
Ideally, the HWC HAL should turn off the backlight when the display is turned
off. This patch enforces this at the PowerManager, which can guard against
errant HWC implementations.
Change-Id: Ibb826a02871c983f8a68034d010e68abe9c5c1d5
Signed-off-by: Iliyan Malchev <malchev@google.com >
2012-08-16 12:48:28 -07:00
Dianne Hackborn
f02b60aa4f
Rename UserId to UserHandle.
...
This is the start of turning this into a formal public API.
Change-Id: I5786d2c320f1de41a06ed5d0f65adb68967287a0
2012-08-16 12:46:38 -07:00
Jeff Brown
23e3ba534c
am 778a616f: am 7c964e78: Merge changes I39804ee6,I6a5a7ea2 into jb-mr1-dev
...
* commit '778a616febe81517dc149bc4adc72a3e27bbc49e':
Use spline interpolation for auto-brightness.
Add FloatMath.hypot.
2012-08-16 02:11:25 -07:00
Jeff Brown
16296450e6
am 39b93467: am e6639750: Merge "Improve auto-brightness debounce." into jb-mr1-dev
...
* commit '39b9346728c28c3551c75b3d10ec2e8d9f8dc211':
Improve auto-brightness debounce.
2012-08-16 02:11:22 -07:00
Jeff Brown
7c964e7899
Merge changes I39804ee6,I6a5a7ea2 into jb-mr1-dev
...
* changes:
Use spline interpolation for auto-brightness.
Add FloatMath.hypot.
2012-08-16 02:07:27 -07:00