Amith Yamasani
870275de28
am 82bb930b: am 67645821: Merge "Don\'t create cache directory for isolated processes" into jb-mr1-dev
...
* commit '82bb930b17cb0f2a84b3dd8fa5c0650291ea2383':
Don't create cache directory for isolated processes
2012-08-19 07:59:18 -07:00
Amith Yamasani
82bb930b17
am 67645821: Merge "Don\'t create cache directory for isolated processes" into jb-mr1-dev
...
* commit '67645821a5c1501edac684b876e49562c70a9424':
Don't create cache directory for isolated processes
2012-08-19 07:56:50 -07:00
Amith Yamasani
67645821a5
Merge "Don't create cache directory for isolated processes" into jb-mr1-dev
2012-08-19 07:54:36 -07:00
Amith Yamasani
11de39a5cf
Don't create cache directory for isolated processes
...
They don't have access anyway
This makes Chrome work in secondary users
Change-Id: I4d30581bc6e807901e642893d6964854c0567fec
2012-08-17 18:01:24 -07:00
Dianne Hackborn
7ebc491aa4
am fabff0a0: am f337a89b: Merge "More view hierarchy, fragment debugging." into jb-mr1-dev
...
* commit 'fabff0a081079a4311c9b8f2d50527005d67c796':
More view hierarchy, fragment debugging.
2012-08-17 17:42:36 -07:00
Dianne Hackborn
fabff0a081
am f337a89b: Merge "More view hierarchy, fragment debugging." into jb-mr1-dev
...
* commit 'f337a89b4d6f6fd0a49b6edd7f895f06cb96d28b':
More view hierarchy, fragment debugging.
2012-08-17 17:41:21 -07:00
Dianne Hackborn
f337a89b4d
Merge "More view hierarchy, fragment debugging." into jb-mr1-dev
2012-08-17 17:39:09 -07:00
Dianne Hackborn
4702a85697
More view hierarchy, fragment debugging.
...
Add a View.toString() method.
Rename all of the View private flags to have a PFLAG prefix to
avoid going insane trying to figure out which constant goes with
which flag.
Activity.dump() now includes a summary of the activity's view
hierarchy, using the View.toString() method.
All exceptions thrown by FragmentManager now perform a dump of
the owning activity state, where appropriate.
Change-Id: I6482e397e10cb5a0612ab02ce6ed5131823437a6
2012-08-17 17:35:00 -07:00
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
77d9f308c0
am 427dccc0: Merge "Fix build part 2" into jb-mr1-dev
...
* commit '427dccc0cdc315f6a4b2be9954ff16f802cd9a60':
Fix build part 2
2012-08-17 17:10:23 -07:00
Amith Yamasani
427dccc0cd
Merge "Fix build part 2" into jb-mr1-dev
2012-08-17 17:08:33 -07:00
Amith Yamasani
fc6e0ca07e
Fix build part 2
...
Change-Id: I3b4ed430f214468a22d3b3aaf3605e570cfd0ed1
2012-08-17 17:07:14 -07:00
Dianne Hackborn
93e3ec3264
am e3d89013: am 5c6912c6: Merge "Fix permission check on ContentProvider to be multi-user aware." into jb-mr1-dev
...
* commit 'e3d89013c6dc683f911a2372b11ffa3542dd10ae':
Fix permission check on ContentProvider to be multi-user aware.
2012-08-17 17:04:58 -07:00
Dianne Hackborn
e3d89013c6
am 5c6912c6: Merge "Fix permission check on ContentProvider to be multi-user aware." into jb-mr1-dev
...
* commit '5c6912c6f697e34d79447b0cd794a6d9edea72ab':
Fix permission check on ContentProvider to be multi-user aware.
2012-08-17 17:03:38 -07:00
Dianne Hackborn
5c6912c6f6
Merge "Fix permission check on ContentProvider to be multi-user aware." into jb-mr1-dev
2012-08-17 17:01:48 -07:00
Dianne Hackborn
0d8af78b74
Fix permission check on ContentProvider to be multi-user aware.
...
Change-Id: I1e504fe6561caef99d478e37660e2294fec7ea8b
2012-08-17 16:51:54 -07:00
Amith Yamasani
ec0d899b2c
am ca5d8dc2: am 14e883b2: Fix merge error
...
* commit 'ca5d8dc2c08f2bfbb0c06e9b7b9cda9776493862':
Fix merge error
2012-08-17 16:41:33 -07:00
Amith Yamasani
ca5d8dc2c0
am 14e883b2: Fix merge error
...
* commit '14e883b25e0998e3bc4e574a0df3db252d6e987f':
Fix merge error
2012-08-17 16:39:09 -07:00
Amith Yamasani
14e883b25e
Fix merge error
...
Didn't apply the recent API change from another CL.
Change-Id: I65ac6108909eca7ac48beabb4a8b7bbedda84249
2012-08-17 16:34:53 -07:00
Chet Haase
503b0cc356
am 0784c870: am 998ca230: Merge "Fix glyph cropping bug" into jb-mr1-dev
...
* commit '0784c87061d7c68ae9814b0353c5f96e857d12a6':
Fix glyph cropping bug
2012-08-17 16:24:59 -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
Chet Haase
0784c87061
am 998ca230: Merge "Fix glyph cropping bug" into jb-mr1-dev
...
* commit '998ca2301c695c02966cc169ce2e407054dc7c5c':
Fix glyph cropping bug
2012-08-17 16:22:49 -07:00
Amith Yamasani
539d2b562f
am 7fdaa397: Merge "Save preferred activity info with user id." into jb-mr1-dev
...
* commit '7fdaa3976d6082bd7e96329240bda478c08b751e':
Save preferred activity info with user id.
2012-08-17 16:21:10 -07:00
Chet Haase
998ca2301c
Merge "Fix glyph cropping bug" into jb-mr1-dev
2012-08-17 16:20:22 -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
Victoria Lease
3e59f3fce6
Merge "LocaleSpan makes Han disambiguation easy!"
2012-08-17 16:14:46 -07:00
Victoria Lease
ec97b4ddb4
LocaleSpan makes Han disambiguation easy!
...
I've also provided TextView.setTextLocale() for use in single-language
TextViews.
Change-Id: I7f1b0d49a2ece957a7b9b5d65d48385bf2c2a668
2012-08-17 16:12:46 -07:00
Chet Haase
5a3ec7113c
Fix glyph cropping bug
...
Glyphs were being stored in the glyph cache incorrectly.
The second row of glyphs in any column were being positioned exactly
one pixel too high, causing the preceding glyph in that column to be
cropped, resulting in the reported truncation in some glyphs.
Issue #7003215 Minor UI truncation while reading the mails
Change-Id: I47ce376f78a04d4e07e8b7ed1b3f0b58864c5498
2012-08-17 16:03:27 -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
f4dbcb6459
am 029675e5: Merge "Fix launching activity from a pending intent" into jb-mr1-dev
...
* commit '029675e5ad8737a8a097c17d216afb3f11f0b12c':
Fix launching activity from a pending intent
2012-08-17 15:56:21 -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
5dd7b11eb2
am 2b7a0d00: Fix addGeofence() and addProximityAlert().
...
* commit '2b7a0d00426218523629e4e8dd2e9197d445c09b':
Fix addGeofence() and addProximityAlert().
2012-08-17 15:38:00 -07:00
Nick Pelly
a44590f3f9
am 4035f5a7: Port location blacklist code to MR1.
...
* commit '4035f5a7c191a68bc9a5912ce44c43c82e9e5dbf':
Port location blacklist code to MR1.
2012-08-17 15:36: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
2bb9b5620b
am 81c304b9: Merge "Send USER_SWITCHED with the correct permission" into jb-mr1-dev
...
* commit '81c304b99d920e8d66ac16332489d78ff7162e12':
Send USER_SWITCHED with the correct permission
2012-08-17 14:01:14 -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
Robert Greenwalt
9f4f54c5d9
am 634f34af: am 5d683a01: am c48ee604: (-s ours) am 6626398a: Merge "Fix for updating TCP buffer size when switching network type"
...
* commit '634f34af410ee181ef104260b2f31a87562eb4e0':
Fix for updating TCP buffer size when switching network type
2012-08-17 13:49:52 -07:00
Robert Greenwalt
634f34af41
am 5d683a01: am c48ee604: (-s ours) am 6626398a: Merge "Fix for updating TCP buffer size when switching network type"
...
* commit '5d683a013114f38f503e6f7194400f60f35bfa5a':
Fix for updating TCP buffer size when switching network type
2012-08-17 13:47:44 -07:00
Robert Greenwalt
5d683a0131
am c48ee604: (-s ours) am 6626398a: Merge "Fix for updating TCP buffer size when switching network type"
...
* commit 'c48ee60426a741d0a8e7df7df8af2a9ac24cee85':
Fix for updating TCP buffer size when switching network type
2012-08-17 13:44:54 -07:00
Jonathan Dixon
1b93e278c6
am 36aa961d: am 9271fa69: Merge "Remove checkThread() from findAddress" into jb-mr1-dev
...
* commit '36aa961d29840c0103ae61f40de88f55e37eb626':
Remove checkThread() from findAddress
2012-08-17 13:34:24 -07:00
Jonathan Dixon
36aa961d29
am 9271fa69: Merge "Remove checkThread() from findAddress" into jb-mr1-dev
...
* commit '9271fa6951a70fc837eeb7a18b22db5d098aecea':
Remove checkThread() from findAddress
2012-08-17 13:32:18 -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
Jonathan Dixon
9271fa6951
Merge "Remove checkThread() from findAddress" into jb-mr1-dev
2012-08-17 13:30:46 -07:00
Robert Greenwalt
c48ee60426
am 6626398a: Merge "Fix for updating TCP buffer size when switching network type"
...
* commit '6626398a72ae592e3a9184c9b0868df0fc1f1724':
Fix for updating TCP buffer size when switching network type
2012-08-17 13:28:25 -07:00