drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,708 Commits 1 Branch 0 Tags
Commit Graph

85708 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
a59441c9a9 am 4ea283a0: Merge "Sanity-check existence of restore agent" into jb-mr1-dev 
* commit '4ea283a05f3724285ed3057ff1de1a344ab3e15a':
  Sanity-check existence of restore agent
 2012-09-07 18:41:37 -07:00
Romain Guy
89dfd2e085 am be6024d5: Merge "Fix crash in ShapeDrawable" into jb-mr1-dev 
* commit 'be6024d57140a81883e6c5a27cae56a7d31d10dc':
  Fix crash in ShapeDrawable
 2012-09-07 18:41:34 -07:00
Christopher Tate
4ea283a05f Merge "Sanity-check existence of restore agent" into jb-mr1-dev 2012-09-07 18:40:12 -07:00
Jim Miller
45ad9679db am 1ac44eb9: Merge "Don\'t hide the PIN keyboard even when a physical keyboard is present." into jb-mr1-dev 
* commit '1ac44eb94d41019961209716052cc81f526440f8':
  Don't hide the PIN keyboard even when a physical keyboard is present.
 2012-09-07 18:39:57 -07:00
Dianne Hackborn
789203ec53 am 5d75052b: Merge "Add Binder.getCallingUserHandle()." into jb-mr1-dev 
* commit '5d75052b2da7ed7c153faea69a28f13a4000788f':
  Add Binder.getCallingUserHandle().
 2012-09-07 18:38:15 -07:00
Romain Guy
be6024d571 Merge "Fix crash in ShapeDrawable" into jb-mr1-dev 2012-09-07 18:38:03 -07:00
Romain Guy
1558cf1498 Fix crash in ShapeDrawable 
Change-Id: Ibc277db46912a73dc3f971f8487baa5eafa8bc84
 2012-09-07 18:37:20 -07:00
Jim Miller
1ac44eb94d Merge "Don't hide the PIN keyboard even when a physical keyboard is present." into jb-mr1-dev 2012-09-07 18:36:46 -07:00
Dianne Hackborn
5d75052b2d Merge "Add Binder.getCallingUserHandle()." into jb-mr1-dev 2012-09-07 18:35:02 -07:00
Dianne Hackborn
74ee8652e0 Add Binder.getCallingUserHandle(). 
Change-Id: I2a7eedfdc7baeeb4c2cd2ca0153aa95e0cf0bf45
 2012-09-07 18:33:18 -07:00
Christopher Tate
e7287a0791 Sanity-check existence of restore agent 
When a restore dataset includes data for an app that used to have
a backup agent, but does not in the currently-installed version, we
were merrily trying to bring up the agent for restore anyway, and
crashing.  Now we don't do that; we check whether there's actually
going to be an agent to handle the data before doing any of the
heavy work.

Bug 7130695

Change-Id: I0a38c2a8bb51d4a140a72d22896fa58d98ebaa02
 2012-09-07 18:32:12 -07:00
Jim Miller
2e5e74f2d3 am ddb12e84: Merge "Enable lazy-loading of security views in keyguard" into jb-mr1-dev 
* commit 'ddb12e845d7c5eae7a6bca6af17702f9bc619ae9':
  Enable lazy-loading of security views in keyguard
 2012-09-07 18:16:25 -07:00
Jim Miller
ddb12e845d Merge "Enable lazy-loading of security views in keyguard" into jb-mr1-dev 2012-09-07 18:13:56 -07:00
Christopher Tate
4cb05d3e88 am 0a266965: Merge "Log all individual settings restored" into jb-mr1-dev 
* commit '0a26696560461b7fc4ecbf9588c291d46d253bda':
  Log all individual settings restored
 2012-09-07 18:12:42 -07:00
Christopher Tate
0a26696560 Merge "Log all individual settings restored" into jb-mr1-dev 2012-09-07 18:10:02 -07:00
Christopher Tate
d71778804c Log all individual settings restored 
Trying to get a handle on bug 7129406

Change-Id: If436c7888f0a8565d83c03024c54ea6ec83e7955
 2012-09-07 18:09:03 -07:00
Jim Miller
e46efc0460 Enable lazy-loading of security views in keyguard 
This change removes all but the default KeyguardSelectorView from KeyguardViewHost
to (1) reduce the overall memory footprint (2) reduce initial layout inflation
time and (3) avoid initializing the camera until needed by face unlock.

Fixes bug 7127666

Change-Id: Ibac1838dd7a490dcadbfab5bdfdd82734b69055a
 2012-09-07 18:07:59 -07:00
Dianne Hackborn
3374ada6ef am 824b959d: Merge "Explicitly specify current user everywhere home is started." into jb-mr1-dev 
* commit '824b959dfc830f3d0aa12afc5fb429980e35f3fd':
  Explicitly specify current user everywhere home is started.
 2012-09-07 18:03:31 -07:00
Dianne Hackborn
824b959dfc Merge "Explicitly specify current user everywhere home is started." into jb-mr1-dev 2012-09-07 18:01:23 -07:00
Jeff Brown
131b15a5a6 am 4d0b5625: Disable hardcoded wifi display adapter. 
* commit '4d0b56255489efc3b35b9f0187f56536f07d5d66':
  Disable hardcoded wifi display adapter.
 2012-09-07 17:54:12 -07:00
Jeff Brown
0cfebf28b1 Retry wifi display connections. 
Change-Id: I48c62c7e272c2696022ddeea1c3107d24a9431b8
 2012-09-07 17:50:58 -07:00
Jeff Brown
4b71e4e66c Add permissions to control and configure wifi display. 
Change-Id: I54af6da53b7243516becd6a3d5985c0feda6c225
 2012-09-07 17:50:57 -07:00
Jeff Brown
4d0b562554 Disable hardcoded wifi display adapter. 
Change-Id: Id0f7d59b6eafa8794ff7616cf54a0b94ba78c763
 2012-09-07 17:50:56 -07:00
Dianne Hackborn
d888399ad4 Explicitly specify current user everywhere home is started. 
Change-Id: I58d86136de7f9cef1eaf72793d0e200b852d7355
 2012-09-07 17:48:06 -07:00
Svetoslav Ganov
c0befe6aff am 0458a69d: Merge "Fixing off by one error in the ScreenMagnifier." into jb-mr1-dev 
* commit '0458a69d4d08a517780c2279ae1dc98ccb3fb916':
  Fixing off by one error in the ScreenMagnifier.
 2012-09-07 17:35:32 -07:00
Svetoslav Ganov
0458a69d4d Merge "Fixing off by one error in the ScreenMagnifier." into jb-mr1-dev 2012-09-07 17:34:01 -07:00
Svetoslav Ganov
2cee686498 Fixing off by one error in the ScreenMagnifier. 
Change-Id: Ia0ccfb6b354b7a18633e7cf26647c6436ebf5c08
 2012-09-07 17:33:09 -07:00
Geremy Condra
1d4e1204ca Add components for the Android Config Updater to system server. 
This adds the necessary bits to verify and install configuration
updates using system server. It also includes the cert pinning
updater as the first user.

Change-Id: I42307f58074157b33b6e01216aab10022340d449
 2012-09-07 16:50:11 -07:00
Jim Miller
ac8f5751f5 Don't hide the PIN keyboard even when a physical keyboard is present. 
Originally this was done for aesthetics when we had a physical keyboard on
devices.  The code also used to hide the PIN keyboard when a BT keyboard is
attached.

We now always show the keyboard, even when a physical keyboard is present.

Change-Id: I8e1f3af200071382bfe267c28d92062758ebb790
 2012-09-07 16:48:41 -07:00
Jeff Brown
36bae4b50a am 72018294: Merge "Make mirroring automatic based on Windows on display." into jb-mr1-dev 
* commit '72018294cc4e3cc5feb7affdec4bf4bb2368ac41':
  Make mirroring automatic based on Windows on display.
 2012-09-07 16:17:23 -07:00
Jeff Brown
54b7362cd6 am 7017e483: Merge "Add support for Wifi display." into jb-mr1-dev 
* commit '7017e48380ab0c1be033594bb2a9331898ad5be8':
  Add support for Wifi display.
 2012-09-07 16:17:19 -07:00
Nick Kralevich
4088457d91 am cd620591: Merge "installd: fix forward locking symlink" into jb-mr1-dev 
* commit 'cd620591b764cd999f18878985444fba01d5b710':
  installd: fix forward locking symlink
 2012-09-07 16:17:16 -07:00
rich cannings
d6870d9a3d am 1275abd0: Merge "Move verification settings to Settings.Global" into jb-mr1-dev 
* commit '1275abd013eee87b3fec5b704a799440cb1c71fe':
  Move verification settings to Settings.Global
 2012-09-07 16:17:12 -07:00
Dianne Hackborn
ca02a46dab am cd42ce5d: Merge "Fix crash when setting wallpaper from non-primary user." into jb-mr1-dev 
* commit 'cd42ce5d61d7854d1add5d4d308d1f3342baeea6':
  Fix crash when setting wallpaper from non-primary user.
 2012-09-07 16:17:09 -07:00
Craig Mautner
7ff3058396 am df4a94e2: Merge "Fix incorrect indexing calculation." into jb-mr1-dev 
* commit 'df4a94e21c78b25d7e35590408efda87ab41b633':
  Fix incorrect indexing calculation.
 2012-09-07 16:17:04 -07:00
Jason Sams
49801ecb54 am cd664f0f: Merge "Add greyscale intrinsic test." into jb-mr1-dev 
* commit 'cd664f0faaaab2442733a9d2675a69a6429549a5':
  Add greyscale intrinsic test.
 2012-09-07 16:16:58 -07:00
Jason Sams
c2f8f102e1 am 3f7bbe8c: Merge "Document ColorMatrix intrinsic and add helpers" into jb-mr1-dev 
* commit '3f7bbe8cd37aba1be1a80222270057d78a032b54':
  Document ColorMatrix intrinsic and add helpers
 2012-09-07 16:16:46 -07:00
Jeff Brown
72018294cc Merge "Make mirroring automatic based on Windows on display." into jb-mr1-dev 2012-09-07 16:01:37 -07:00
Jeff Brown
7017e48380 Merge "Add support for Wifi display." into jb-mr1-dev 2012-09-07 16:00:13 -07:00
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
Jason Sams
17fec32bba Fix doc typo. 
Change-Id: Ib18172ac72886865dc9ae4535a577b2f8f3468e9
 2012-09-07 15:42:55 -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