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

85604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Kralevich
93e62e2e18 am 4088457d: am cd620591: Merge "installd: fix forward locking symlink" into jb-mr1-dev 
* commit '4088457d91ee4578369471e9d2ea127b799399bf':
  installd: fix forward locking symlink
 2012-09-10 17:08:30 -07:00
rich cannings
c491c1bf06 am d6870d9a: am 1275abd0: Merge "Move verification settings to Settings.Global" into jb-mr1-dev 
* commit 'd6870d9a3d9a9104ae54abfbd2876206c180b925':
  Move verification settings to Settings.Global
 2012-09-10 17:08:26 -07:00
Dianne Hackborn
e062bf6204 am ca02a46d: am cd42ce5d: Merge "Fix crash when setting wallpaper from non-primary user." into jb-mr1-dev 
* commit 'ca02a46dab9607331486d5f6c2189bae42a64592':
  Fix crash when setting wallpaper from non-primary user.
 2012-09-10 17:08:22 -07:00
Craig Mautner
258833a0d9 am 7ff30583: am df4a94e2: Merge "Fix incorrect indexing calculation." into jb-mr1-dev 
* commit '7ff30583962b0ab9e37747e4b56cb7a619fb8561':
  Fix incorrect indexing calculation.
 2012-09-10 17:08:19 -07:00
Jason Sams
8342162287 am 49801ecb: am cd664f0f: Merge "Add greyscale intrinsic test." into jb-mr1-dev 
* commit '49801ecb542531e0e83bfc4ded22a9f47f910d7c':
  Add greyscale intrinsic test.
 2012-09-10 17:08:15 -07:00
Jason Sams
bfd09308cf am c2f8f102: am 3f7bbe8c: Merge "Document ColorMatrix intrinsic and add helpers" into jb-mr1-dev 
* commit 'c2f8f102e1b7a38adc0fc835e532a7cfbee2cf04':
  Document ColorMatrix intrinsic and add helpers
 2012-09-10 17:08:09 -07:00
Amith Yamasani
f0d067ba44 am 4cf05484: am 5fc62663: Merge "Resolve the correct home intent for secondary users" into jb-mr1-dev 
* commit '4cf0548452493cabbb7f7c09ab3ecb2ebe77ff8e':
  Resolve the correct home intent for secondary users
 2012-09-10 17:07:59 -07:00
Chris Craik
2fcf554891 am 0d11ac12: am dc531fa7: Merge "Handle different x, y scales in drawLines AA path" into jb-mr1-dev 
* commit '0d11ac12a238379e0a9c24a3b522035997f40d4f':
  Handle different x, y scales in drawLines AA path
 2012-09-10 17:07:55 -07:00
The Android Open Source Project
bb999845cc am 100e36f2: (-s ours) am 330a5bf8: am 2ff43774: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '100e36f2c21ed3028a09e6635c21d4b1627b5865':
  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-10 17:07:51 -07:00
Raph Levien
9aa6922ba5 am 3b43678c: (-s ours) am 965e7ff4: Merge "Fix Time.parse and Time.parse3339 crashing bugs. DO NOT MERGE" into jb-mr1-dev 
* commit '3b43678ca727b2a9c39662c6266d194e50c9bdc6':
  Fix Time.parse and Time.parse3339 crashing bugs. DO NOT MERGE
 2012-09-10 17:07:34 -07:00
Christopher Tate
e6de051799 am 20779a1a: am d6a53c31: Merge "Refer to STAY_ON_WHILE_PLUGGED_IN via the Global namespace" into jb-mr1-dev 
* commit '20779a1ace8322064575f03d10598650ba91181c':
  Refer to STAY_ON_WHILE_PLUGGED_IN via the Global namespace
 2012-09-10 17:07:28 -07:00
The Android Open Source Project
193ae1077a am 07cdbadc: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '07cdbadc17f3bc85ecda7797291ce79dd22c9792':
  Convert resized() method to new parameters.
  Don't depend on LockPatternUtils to get DevicePolicyManager
  Fix issue #7097984 java.lang.SecurityException: Permission Denial:
  Work around instability of Display.getRotation().
  GestureDetector - Mask action when checking POINTER_UP
  Turn off deadzone flash, replacing it with logcat.
  Fixed MemoryUsage issue with reporting results.
  Use focal point for scrolling in GestureDetector
  Fix keyguard layout on tablet
  Check proximity detector before powering off.
  Fix PendingIntent caching for multiuser
  Fix adb install
 2012-09-10 17:07:21 -07:00
Eric Laurent
585c19c79b am bf20314a: am 7c026320: Merge "AudioSystem: new audio device enums" into jb-mr1-dev 
* commit 'bf20314a8af8e4288b3d3ad6dc9313e0914f8955':
  AudioSystem: new audio device enums
 2012-09-10 17:07:04 -07:00
Chet Haase
be6665a933 am 39b72a7a: am 89b3f48f: Merge "Enable changing properties of layer paint" into jb-mr1-dev 
* commit '39b72a7aaef1f7a5b7e43a6d0fe5a619b303fe66':
  Enable changing properties of layer paint
 2012-09-10 17:06:53 -07:00
Christopher Tate
bb8234b85b am f1c675bc: am c0be8c85: Merge "Refer to STAY_ON_WHILE_PLUGGED_IN in the global namespace" into jb-mr1-dev 
* commit 'f1c675bccd4efccb5acb982602943befa85ed660':
  Refer to STAY_ON_WHILE_PLUGGED_IN in the global namespace
 2012-09-10 17:06:39 -07:00
Dianne Hackborn
3f6f96b526 am 00b7d2a0: am 649d0d71: Merge "More multi-user stuff:" into jb-mr1-dev 
* commit '00b7d2a0de5d235f7eab721d4369bf93af512351':
  More multi-user stuff:
 2012-09-10 17:06:32 -07:00
Romain Guy
310558876c am f9dd3811: am 55e6b77b: Merge "Reduce the number of locks acquired by display lists" into jb-mr1-dev 
* commit 'f9dd3811a3e6712fd88d3af064bd53100b0e6d15':
  Reduce the number of locks acquired by display lists
 2012-09-10 17:06:21 -07:00
Dianne Hackborn
dd164115a0 am 15f91d91: am 417984dc: Merge "Wrapped call to notifyAll() in a synchronized block" into jb-mr1-dev 
* commit '15f91d9151aa9c2090c4c410310ddac2b0616d25':
  Wrapped call to notifyAll() in a synchronized block
 2012-09-10 17:06:13 -07:00
Adam Koch
ff9d7b770a am 173166a2: am 14c62518: 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 
* commit '173166a23080fd6ad8e7eb566fd38977bb5f6d18':
  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-10 17:06:07 -07:00
Christopher Tate
06e6fb78ec am 041aa46a: am 970683c5: Merge "Further fixup of migration to global settings" into jb-mr1-dev 
* commit '041aa46a851f9e6d4e80b98f0c9cbe2ec89faec7':
  Further fixup of migration to global settings
 2012-09-10 17:06:00 -07:00
Teng-Hui Zhu
607caa925c am f6cc1ddc: am 4db5d23d: Merge "Back key to dismiss full screen video" into jb-mr1-dev 
* commit 'f6cc1ddc35d30a7314201011353840bd0aa8935b':
  Back key to dismiss full screen video
 2012-09-10 17:05:48 -07:00
Fabrice Di Meglio
5733c2c174 am 8bcf577a: am d672d29d: Merge "Update documentation for layout direction qualifiers for Resouces" into jb-mr1-dev 
* commit '8bcf577aa095d7f1e14c33ac5e6cf39f904bdfdd':
  Update documentation for layout direction qualifiers for Resouces
 2012-09-10 17:05:42 -07:00
Fabrice Di Meglio
b52d4e627d am 778d7508: am bae1d478: Merge "Fix the build" into jb-mr1-dev 
* commit '778d7508df2edacd2f9eac3df51979542cc5177b':
  Fix the build
 2012-09-10 17:05:35 -07:00
Katie McCormick
1264670e70 am 2eb318e6: am 56b62939: am 21d8331d: am ae050d56: Merge "Doc update: Appwidgets JB additions." into jb-dev 
* commit '2eb318e6c4e8a9d80585306311a05c472ca08d3d':
  Doc update: Appwidgets JB additions.
 2012-09-10 17:05:23 -07:00
Dirk Dougherty
c6bb211f45 am 1e118476: am 7629a917: am 0152a51c: am 882b267d: Merge "Doc change: fix typo in JB highlights." into jb-dev 
* commit '1e1184761a0f92de8517390b2e514f53c30062c2':
  Doc change: fix typo in JB highlights.
 2012-09-10 17:05:13 -07:00
Svetoslav Ganov
8d3d852243 am eef5dc63: am 390a06b8: Merge "Restore accessibility focus after ListView layout." into jb-mr1-dev 
* commit 'eef5dc63d805f39eb0c68c93980a7ae728db3f7f':
  Restore accessibility focus after ListView layout.
 2012-09-10 17:05:06 -07:00
Romain Guy
d9d1721812 am 45aef365: am 6543c292: Merge "The drawables cache strikes again Bug #7117785" into jb-mr1-dev 
* commit '45aef365f6087e6cca6fce480e6230a9eb35aa6e':
  The drawables cache strikes again Bug #7117785
 2012-09-10 17:05:02 -07:00
Fabrice Di Meglio
24d9c9c9b3 am 8060ee1f: am f6aa537c: Merge "Make ProgressBar / SeekBar / RatingBar widgets aware of layout direction" into jb-mr1-dev 
* commit '8060ee1f11a504da82ebe6ac63a3e741c023837c':
  Make ProgressBar / SeekBar / RatingBar widgets aware of layout direction
 2012-09-10 17:04:58 -07:00
Fabrice Di Meglio
113fce81d8 am c94106d7: am 01fcb728: Merge "Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources" into jb-mr1-dev 
* commit 'c94106d7c9b3bfe5591a1433440cb19d73a9fb5d':
  Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources
 2012-09-10 17:04:53 -07:00
Baligh Uddin
095b54fc1d Import translations. DO NOT MERGE 
Change-Id: Iba715653d9716ae6da378f3852b7f9ccf2c3781a
Auto-generated-cl: translation import
 2012-09-10 10:46:20 -07:00
Geremy Condra
aaa8b0d50a Merge "Add components for the Android Config Updater to system server." 2012-09-08 17:51:16 -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
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
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
4cf0548452 am 5fc62663: Merge "Resolve the correct home intent for secondary users" into jb-mr1-dev 
* commit '5fc626639aa7ff2aed224b58891149e19fb24b57':
  Resolve the correct home intent for secondary users
 2012-09-07 15:31:37 -07:00
Chris Craik
0d11ac12a2 am dc531fa7: Merge "Handle different x, y scales in drawLines AA path" into jb-mr1-dev 
* commit 'dc531fa7d4ec545ace1b3daae0849d3101102e49':
  Handle different x, y scales in drawLines AA path
 2012-09-07 15:29:59 -07:00