83532 Commits

Author SHA1 Message Date
Amith Yamasani
7c0c206b28 am 2d78fa2d: am ff7735b0: am a3db5297: Merge "ProviderMap: remove hashmap when entire user specific entries are removed"
* commit '2d78fa2d2558dc8c6d6400232c742da7936c6204':
  ProviderMap: remove hashmap when entire user specific entries are removed
2012-08-20 10:49:13 -07:00
Amith Yamasani
2d78fa2d25 am ff7735b0: am a3db5297: Merge "ProviderMap: remove hashmap when entire user specific entries are removed"
* commit 'ff7735b0ee8c3347d0f3cb1866e454be0e9534e2':
  ProviderMap: remove hashmap when entire user specific entries are removed
2012-08-20 10:47:41 -07:00
Amith Yamasani
ff7735b0ee am a3db5297: Merge "ProviderMap: remove hashmap when entire user specific entries are removed"
* commit 'a3db5297cda370ce41db99b6839cd9528c31ef7c':
  ProviderMap: remove hashmap when entire user specific entries are removed
2012-08-20 10:45:12 -07:00
Craig Mautner
8f260c9a68 am ec42c3c3: Merge "Ensure that mAllAppWinAnimators is not null." into jb-mr1-dev
* commit 'ec42c3c35fd4c16e1823cfd0e5b589ed2d205aa7':
  Ensure that mAllAppWinAnimators is not null.
2012-08-20 10:33:29 -07:00
Craig Mautner
ec42c3c35f Merge "Ensure that mAllAppWinAnimators is not null." into jb-mr1-dev 2012-08-20 10:30:00 -07:00
Craig Mautner
bea12bdc2e Ensure that mAllAppWinAnimators is not null.
The method showAllWindowsLocked can be called from the layout
side of the WindowManagerService. Previously the AppWindowAnimator
member mAllAppWinAnimators was created on the animation side. If
showAllWindowsLocked was called before the first animation of the
activity an NPE would occur. This fix creates mAllAppWinAnimators
when the AppWindowAnimator is created and also updates it with
current values before calling showAllWindowsLocked.

Fixes bug 6917136.

Change-Id: If3ace22022b65c6888bbb9d0575efe9a45d86475
2012-08-20 10:23:18 -07:00
Amith Yamasani
a3db5297cd Merge "ProviderMap: remove hashmap when entire user specific entries are removed" 2012-08-20 10:16:36 -07:00
Przemyslaw Szczepaniak
0430aab3df am 091d56ca: Fix double call to TTS connection disconnect() on reconnect
* commit '091d56cab8f6f6a3460fbb596f99b1a262948e96':
  Fix double call to TTS connection disconnect() on reconnect
2012-08-20 09:01:04 -07:00
Przemyslaw Szczepaniak
091d56cab8 Fix double call to TTS connection disconnect() on reconnect
- Sets the service connection to null when unbindService is called,
instead of in onServiceDisconnected. This avoids a double disconnect
if a call to onServiceConnected is received before a call to
onServiceDisconnected.

- Extended synchronize on runAction error handling and reconnection.
This prevents from reconnecting N times if N>1 threads enter this method
while there's issue with TTS service.

Bug:6993880
Change-Id: I5a387622c6032a18d17fc072029ae6be1a9b8e6c
2012-08-20 08:56:39 -07:00
Jeff Brown
30e7d7620c am bf5740e7: Improve display manager debugging.
* commit 'bf5740e75efd87ae0213486e78e029403804c6f0':
  Improve display manager debugging.
2012-08-19 23:26:02 -07:00
Jeff Brown
bf5740e75e Improve display manager debugging.
Change-Id: Iae794fe99a7cf9809f64eafb216091126a2f7e39
2012-08-19 23:20:02 -07:00
Jeff Brown
aa32f5f0db am 98365d76: Refactor for multi-display support.
* commit '98365d7663cbd82979a5700faf0050220b01084d':
  Refactor for multi-display support.
2012-08-19 23:10:13 -07:00
Jeff Brown
2112e19098 am 848c2dc9: Stub out display manager service implementation.
* commit '848c2dc93b6795e171f3dd6f64ea0be65e2762ca':
  Stub out display manager service implementation.
2012-08-19 23:10:09 -07:00
Jeff Brown
98365d7663 Refactor for multi-display support.
Split WindowManagerImpl into two parts, the WindowManager
interface implementation remains where it is but the global
communications with the window manager are now handled by
the WindowManagerGlobal class.  This change greatly simplifies
the challenge of having separate WindowManager instances
for each Context.

Removed WindowManagerImpl.getDefault().  This represents the
bulk of this change.  Most of the usages of this method were
either to perform global functions (now handled by WindowManagerGlobal)
or to obtain the default display (now handled by DisplayManager).

Explicitly associate each new window with a display and make
the Display object available to the View hierarchy.

Add stubs for some new display manager API features.

Start to split apart the concepts of display id and layer stack.
since they operate at different layers of abstraction.
While it's true that each logical display uniquely corresponds to a
surface flinger layer stack, it is not necessarily the case that
they must use the same ids.  Added Display.getLayerStack()
and started using it in places where it was relatively easy to do.

Change-Id: I29ed909114dec86807c4d3a5059c3fa0358bea61
2012-08-19 22:42:08 -07:00
Jeff Brown
848c2dc93b Stub out display manager service implementation.
Reverting to the previous stub as the display adapter registration
and the logical to physical mapping is not at all what we are going
to need moving forward.

Fixed up the service initialization order so that the display manager
service has a context from the start.

Change-Id: I717f2f1099c7a77180ef207c371ec8329258850a
2012-08-19 21:21:37 -07:00
Guang Zhu
41cae3c2b6 am 82d53ce2: Merge "fix sdcard path for webkit perf and layout test scripts" into jb-mr1-dev
* commit '82d53ce283b7c275624d66e9bf20cfe2614af5c4':
  fix sdcard path for webkit perf and layout test scripts
2012-08-19 15:31:24 -07:00
Guang Zhu
82d53ce283 Merge "fix sdcard path for webkit perf and layout test scripts" into jb-mr1-dev 2012-08-19 15:29:08 -07:00
Guang Zhu
8aaa32b13e fix sdcard path for webkit perf and layout test scripts
paths are moved from /sdcard/ to /sdcard/0/

Change-Id: I27dee294eff033da47c5de17c3b7843790386be3
2012-08-19 15:27:40 -07:00
Amith Yamasani
b3af04465d am 2284c36b: Merge "Fixed static wallpaper for multi-user" into jb-mr1-dev
* commit '2284c36bfac6507be9c4361557a7e8359c319ae4':
  Fixed static wallpaper for multi-user
2012-08-19 07:58:33 -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
2284c36bfa Merge "Fixed static wallpaper for multi-user" into jb-mr1-dev 2012-08-19 07:56:16 -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
ce777171fc Fixed static wallpaper for multi-user
Earlier assumption that systemui was running in the system process
does not hold true, so running static wallpaper in its own user
sandbox.

Bug: 7008230
Change-Id: I32a128e6bbd8efa7006286330e970bafcf37f05a
2012-08-18 22:13:07 -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
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
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
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
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
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
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
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
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
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