83894 Commits

Author SHA1 Message Date
Nick Kralevich
cd620591b7 Merge "installd: fix forward locking symlink" into jb-mr1-dev 2012-09-07 15:58:44 -07:00
rich cannings
1275abd013 Merge "Move verification settings to Settings.Global" into jb-mr1-dev 2012-09-07 15:54:13 -07:00
Dianne Hackborn
cd42ce5d61 Merge "Fix crash when setting wallpaper from non-primary user." into jb-mr1-dev 2012-09-07 15:52:37 -07:00
Dianne Hackborn
11941fd651 Fix crash when setting wallpaper from non-primary user.
When accessing a content provider, there is a check for whether
the provider can run in the caller's process; if so, even if the
provider is currently published, we return to the caller that it
can run locally.

This check was broken -- it had an old condition that allowed
content providers owned by the system UID to run in any other UID's
process.  This is wrong, since by definition the other
UIDs would not be able to access the data under the original UID.

We ran into this because the activity picker is part of the
android platform manifest, so runs as the system process.  However
it needs to run as the user who invoked it, so when coming from the
non-primary user we spin up a "system" process running as a uid of
that user.  Now when that process tries to access the settings
provider, the broken check would think that a new instance of the
settings provider should be created in the caller's process.

Change-Id: I7bf495ed8370cb271bdaec073d5b7dda9e38c546
2012-09-07 15:50:26 -07:00
Nick Kralevich
7de350a913 installd: fix forward locking symlink
installd was not creating a compatibility symlink when
installing a forward locked application.  Fix.

Bug: 7121527
Change-Id: Ied507ab2b759d8658af563e6ac8f0dbb0d286cce
2012-09-07 15:48:11 -07:00
Craig Mautner
df4a94e21c Merge "Fix incorrect indexing calculation." into jb-mr1-dev 2012-09-07 15:48:07 -07:00
Craig Mautner
efb735dbaf Fix incorrect indexing calculation.
Fixes bug 7129583.

Change-Id: Ia395a7acded05686668d5b3cee09d49025a9f339
2012-09-07 15:40:24 -07:00
Jason Sams
cd664f0faa Merge "Add greyscale intrinsic test." into jb-mr1-dev 2012-09-07 15:40:11 -07:00
Jason Sams
3f7bbe8cd3 Merge "Document ColorMatrix intrinsic and add helpers" into jb-mr1-dev 2012-09-07 15:38:25 -07:00
rich cannings
4d8fc793f0 Move verification settings to Settings.Global
Move Settings.Secure.PACKAGE_VERIFIER_ENABLE,
Settings.Secure.PACKAGE_VERIFIER_TIMEOUT,
Settings.Secure.PACKAGE_VERIFIER_DEFAULT_RESPONSE to
Settings.Global.PACKAGE_VERIFIER_ENABLE,
Settings.Global.PACKAGE_VERIFIER_TIMEOUT,
Settings.Global.PACKAGE_VERIFIER_DEFAULT_RESPONSE, respectively.

Bug: 7082362
Change-Id: I21fde031a330563891c0129132f3d6369ac5e7a5
2012-09-07 15:34:08 -07:00
Amith Yamasani
5fc626639a Merge "Resolve the correct home intent for secondary users" into jb-mr1-dev 2012-09-07 15:28:09 -07:00
Chris Craik
dc531fa7d4 Merge "Handle different x, y scales in drawLines AA path" into jb-mr1-dev 2012-09-07 15:27:05 -07:00
The Android Open Source Project
330a5bf82e am 2ff43774: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '2ff437745ec1e3463d4e7b831bf2b173aa38dad4':
  DO NOT MERGE - Make WebView track focal points more accurately
  DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
2012-09-07 15:24:05 -07:00
The Android Open Source Project
2ff437745e Reconcile with jb-mr0-release - do not merge
Change-Id: I1e3c8a0ea72c31ae91cdbd6453c32d8c6901a29a
2012-09-07 15:21:16 -07:00
Chris Craik
75040f8a77 Handle different x, y scales in drawLines AA path
bug:7114630

Fixes different x, y scales, and fixes boundaryWidthProportion to be from
center, not edge.

Also adds drawLine tests that previously drew blurry.

Change-Id: I2b648a60361ad3931eac67647b9b27909525ee1e
2012-09-07 15:20:38 -07:00
Raph Levien
965e7ff4de Merge "Fix Time.parse and Time.parse3339 crashing bugs. DO NOT MERGE" into jb-mr1-dev 2012-09-07 15:08:42 -07:00
Amith Yamasani
259d5e56a8 Resolve the correct home intent for secondary users
Fix some searches through the Activity stack.

This allows SetupWizard to be launched for the second user.

Change-Id: Icd306319f511c902557bd9985d80dda228e32d96
2012-09-07 15:04:36 -07:00
Christopher Tate
d6a53c3156 Merge "Refer to STAY_ON_WHILE_PLUGGED_IN via the Global namespace" into jb-mr1-dev 2012-09-07 15:02:38 -07:00
Christopher Tate
62df6eb508 Refer to STAY_ON_WHILE_PLUGGED_IN via the Global namespace
It moved from System to Global, so writes are not automatically redirected
to the new namespace (else apps would start crashing).

Bug 7126575

Change-Id: Ief31fcb5a6107a098da04d30d146e16921dee776
2012-09-07 15:00:54 -07:00
Eric Laurent
7c02632043 Merge "AudioSystem: new audio device enums" into jb-mr1-dev 2012-09-07 14:53:29 -07:00
Chet Haase
89b3f48fa3 Merge "Enable changing properties of layer paint" into jb-mr1-dev 2012-09-07 14:44:43 -07:00
Christopher Tate
c0be8c85b0 Merge "Refer to STAY_ON_WHILE_PLUGGED_IN in the global namespace" into jb-mr1-dev 2012-09-07 14:22:59 -07:00
Christopher Tate
ad73532041 Refer to STAY_ON_WHILE_PLUGGED_IN in the global namespace
This is the one relevant setting that moved from System to Global,
a move that we do not automatically redirect on writes.

Change-Id: I7b26d0c364695c4a10a7cd477db3dfcfe89d7ef5
2012-09-07 14:19:43 -07:00
Dianne Hackborn
649d0d71b2 Merge "More multi-user stuff:" into jb-mr1-dev 2012-09-07 14:11:56 -07:00
Romain Guy
55e6b77bda Merge "Reduce the number of locks acquired by display lists" into jb-mr1-dev 2012-09-07 14:01:31 -07:00
Romain Guy
58ecc204fb Reduce the number of locks acquired by display lists
Change-Id: I1123aae0355de84db705bb75042c7083fc69c9f2
2012-09-07 14:01:09 -07:00
Dianne Hackborn
5e03e2ca7d More multi-user stuff:
- New (hidden) isUserRunning() API.
- Maintain LRU list of visited users.
- New FLAG_IS_DATA_ONLY for ApplicationInfo.
- Clean up pending intent records when force-stopping a user (or package).
  (Also fixes bug #6880627: PendingIntent.getService() returns stale
  intent of force stopped app)
- Fix force-stopping when installing an app to do the force-stop across
  all users for that app.
- When selecting which processes to kill during a force stop, do this
  based on the actual packages loaded in the process, not just process
  name matching.
- You can now use --user option in am when starting activities, services,
  and instrumentation.
- The am --user option accepts "current" and "all" as arguments.
- The pm uninstall command now uninstalls for all users, so it matches
  the semantics of the install command.
- PhoneWindowManager now explicitly says to start home in the current
  user.
- Activity manager call to retrieve the MIME type from a content provider
  now takes a user argument, so it will direct this to the proper user.
- The package manager uninstall paths are now implemented around
  PackageSetting, not PackageParser.Package.  This allows them to work
  even if the application's apk has been removed (in which case it only
  exists as a PackageSetting, not the PackageParser.Package parsed from
  the apk).

Change-Id: I3522f6fcf32603090bd6e01cc90ce70b6c5aae40
2012-09-07 13:55:23 -07:00
Dianne Hackborn
417984dc0d Merge "Wrapped call to notifyAll() in a synchronized block" into jb-mr1-dev 2012-09-07 13:27:47 -07:00
Chet Haase
d15ebf25c5 Enable changing properties of layer paint
Previously, to draw a layered view with a changed Paint object for the
drawLayer operation, you'd have to invalidate the parent view, to get the
native DisplayList to pick up the new Paint properties. This change adds
API and functionality so that the developer can call setLayerPaint(), which
does the proper invalidation (lightweight, doesn't cause redrawing the view).

Issue #6923810 Make it easy to efficiently animate a layer's Paint

Change-Id: I7fea79788d50f6d9c86dd5e5b2a4490cb95142bb
2012-09-07 13:27:02 -07:00
Adam Koch
14c625188a am aa98d509: am 6525f7bf: Merge "Updates to "Displaying Bitmaps Efficiently" class. Changes: -Updated code sample (see http://ag/214812) -Updated code snippets to match updated sample -Fixed <> in code snippets -Updated disk cache section -Some other minor update
* commit 'aa98d509500ba963f9dcda55073f312ee643cb46':
  Updates to "Displaying Bitmaps Efficiently" class. Changes:  -Updated code sample (see http://ag/214812)  -Updated code snippets to match updated sample  -Fixed <> in code snippets  -Updated disk cache section  -Some other minor updates
2012-09-07 13:20:16 -07:00
Adam Koch
aa98d50950 am 6525f7bf: Merge "Updates to "Displaying Bitmaps Efficiently" class. Changes: -Updated code sample (see http://ag/214812) -Updated code snippets to match updated sample -Fixed <> in code snippets -Updated disk cache section -Some other minor updates" into jb-de
* commit '6525f7bfcfaf66fe0d549cb3c3d22a751535932e':
  Updates to "Displaying Bitmaps Efficiently" class. Changes:  -Updated code sample (see http://ag/214812)  -Updated code snippets to match updated sample  -Fixed <> in code snippets  -Updated disk cache section  -Some other minor updates
2012-09-07 13:17:45 -07:00
Adam Koch
6525f7bfcf Merge "Updates to "Displaying Bitmaps Efficiently" class. Changes: -Updated code sample (see http://ag/214812) -Updated code snippets to match updated sample -Fixed <> in code snippets -Updated disk cache section -Some other minor updates" into jb-dev 2012-09-07 13:15:02 -07:00
Christopher Tate
970683c5d4 Merge "Further fixup of migration to global settings" into jb-mr1-dev 2012-09-07 12:56:42 -07:00
Elliott Hughes
5ef49427b6 Fix Time.parse and Time.parse3339 crashing bugs. DO NOT MERGE
Two reported by users, the other spotted by inspection.

Bug: http://code.google.com/p/android/issues/detail?id=16002
Bug: http://code.google.com/p/android/issues/detail?id=22225
Change-Id: I86fe022fda4af68e5a6fb9dc5dd2abdb75e9d966

This was committed to master, cherry-picking to jb-mr1-dev
2012-09-07 12:42:18 -07:00
Christopher Tate
9219874be9 Further fixup of migration to global settings
The Settings.System.STAY_ON_WHILE_PLUGGED element should have been
migrated to the global table, but wasn't.  This CL does a couple of
things around dealing with this:

(1) Tidies up the migration tables outright, so that they correctly
    reflect the intended final state

(2) Introduces the option of doing a key migration only if the element
    has not yet been moved to the new table, to allow for safe retry-
    -with-ignore.  This will make it easy to make any future alterations
    to the global vs per-user association of individual elements

(3) Migrates the STAY_ON_WHILE_PLUGGED element if it hasn't been already.

Bug 7126575

Change-Id: Ic5fa9ba45f11b09270bd5bc94c26fbbd84abc749
2012-09-07 12:00:13 -07:00
Teng-Hui Zhu
4db5d23dea Merge "Back key to dismiss full screen video" into jb-mr1-dev 2012-09-07 11:49:54 -07:00
Fabrice Di Meglio
d672d29dd0 Merge "Update documentation for layout direction qualifiers for Resouces" into jb-mr1-dev 2012-09-07 11:39:27 -07:00
Fabrice Di Meglio
bae1d47896 Merge "Fix the build" into jb-mr1-dev 2012-09-07 11:37:35 -07:00
Fabrice Di Meglio
c5daf84f66 Fix the build
- use fully qualified name for Javadoc

Change-Id: Ic75ce7e19d407dc40c96b585f9fa1827fb614ba1
2012-09-07 11:36:21 -07:00
Katie McCormick
56b6293976 am 21d8331d: am ae050d56: Merge "Doc update: Appwidgets JB additions." into jb-dev
* commit '21d8331d610bb641e63e9f7ff00bb5db8f97f283':
  Doc update: Appwidgets JB additions.
2012-09-07 11:10:53 -07:00
Katie McCormick
21d8331d61 am ae050d56: Merge "Doc update: Appwidgets JB additions." into jb-dev
* commit 'ae050d56247257f652fecb71e3f2ed474238e23f':
  Doc update: Appwidgets JB additions.
2012-09-07 11:08:46 -07:00
Katie McCormick
ae050d5624 Merge "Doc update: Appwidgets JB additions." into jb-dev 2012-09-07 11:06:00 -07:00
Dirk Dougherty
7629a917d7 am 0152a51c: am 882b267d: Merge "Doc change: fix typo in JB highlights." into jb-dev
* commit '0152a51c46743a6759711b872c80b406ae4c8a44':
  Doc change: fix typo in JB highlights.
2012-09-07 10:55:14 -07:00
Dirk Dougherty
0152a51c46 am 882b267d: Merge "Doc change: fix typo in JB highlights." into jb-dev
* commit '882b267d189bdbab02e44f7fe87c5c55aa04c493':
  Doc change: fix typo in JB highlights.
2012-09-07 10:52:37 -07:00
Dirk Dougherty
882b267d18 Merge "Doc change: fix typo in JB highlights." into jb-dev 2012-09-07 10:49:42 -07:00
Dirk Dougherty
6ca8f880bd Doc change: fix typo in JB highlights.
Change-Id: I807a8ecee5d352c8494154629b92474ba4b0e892
2012-09-07 10:48:05 -07:00
Eric Laurent
53082eced9 AudioSystem: new audio device enums
Update audio device enums to match new definitions in
native framework.

Change-Id: Ie257ab0423e3567f4af5a02b03e128af6c714da6
2012-09-07 10:41:03 -07:00
Svetoslav Ganov
390a06b882 Merge "Restore accessibility focus after ListView layout." into jb-mr1-dev 2012-09-07 10:32:55 -07:00
Romain Guy
6543c292b2 Merge "The drawables cache strikes again Bug #7117785" into jb-mr1-dev 2012-09-07 10:32:55 -07:00
alanv
30ee76cf05 Restore accessibility focus after ListView layout.
Bug: 6439454
Change-Id: Ia61f5153b32c6ce5d18301f74e7e79c86349b987
2012-09-07 10:31:16 -07:00