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

85762 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Wu-cheng Li
d70703c135 am 41bd89f6: Merge "Pass EXCLUDE_FROM_RECENTS when starting secure camera." into jb-mr1-dev 
* commit '41bd89f6b61296492d3775e5ef30e94c5f18d34f':
  Pass EXCLUDE_FROM_RECENTS when starting secure camera.
 2012-09-09 23:43:40 -07:00
Wu-cheng Li
41bd89f6b6 Merge "Pass EXCLUDE_FROM_RECENTS when starting secure camera." into jb-mr1-dev 2012-09-09 23:39:36 -07:00
Dianne Hackborn
aaf7fdbf89 am 01a7c79d: Merge "Various fixes." into jb-mr1-dev 
* commit '01a7c79dda60c572af0db5820a66680d0faf95cf':
  Various fixes.
 2012-09-09 18:22:19 -07:00
Dianne Hackborn
01a7c79dda Merge "Various fixes." into jb-mr1-dev 2012-09-09 18:19:50 -07:00
Dianne Hackborn
2d1b378191 Various fixes. 
Bug #7132226: Can't start instrumentation due to ActivityManagerService crash
Bug #6912004: tap on gmail notification sends me to home screen

Change-Id: I824128b01f368de95dee288f8e49039b84479a7e
 2012-09-09 18:14:32 -07:00
Jeff Brown
125fce7066 am 3e6d426d: Merge "Handle case where user info might not be available." into jb-mr1-dev 
* commit '3e6d426d8d28e172af6b62c7b9e4b70c25c5facb':
  Handle case where user info might not be available.
 2012-09-09 17:33:49 -07:00
Jeff Brown
3e6d426d8d Merge "Handle case where user info might not be available." into jb-mr1-dev 2012-09-09 17:31:01 -07:00
Jeff Brown
7a8cce3d8a Handle case where user info might not be available. 
The CursorLoader can return a null cursor if the query
failed for some reason.  This may happen in certain states
where the provider is not available.

Bug: 7133411
Change-Id: Id7b383bca45a61bc8726ba9f6115cbbc07e5d0b4
 2012-09-09 17:26:50 -07:00
Irfan Sheriff
e7d87ac0c5 am ab603ace: Merge "Update WifiP2pWfdDevInfo from device found event" into jb-mr1-dev 
* commit 'ab603ace22c9f0fe256616697ebfa4ef2928985b':
  Update WifiP2pWfdDevInfo from device found event
 2012-09-09 17:17:45 -07:00
Irfan Sheriff
ab603ace22 Merge "Update WifiP2pWfdDevInfo from device found event" into jb-mr1-dev 2012-09-09 17:16:35 -07:00
Irfan Sheriff
1f6d870691 Update WifiP2pWfdDevInfo from device found event 
Change-Id: I197e84e16147d3db7362e3d6d169ff917c112de2
 2012-09-09 17:10:47 -07:00
Elliott Hughes
e2701ec3ff am e3e53498: am 61d09810: am 3150feef: am bfe1ab82: Merge "Fix aapt to get expat header files from the approved location." 
* commit 'e3e5349874fd1534cafe6f8c1cd28bf4f53181c3':
  Fix aapt to get expat header files from the approved location.
 2012-09-09 16:15:00 -07:00
Elliott Hughes
e3e5349874 am 61d09810: am 3150feef: am bfe1ab82: Merge "Fix aapt to get expat header files from the approved location." 
* commit '61d09810a7b478810adc15af2495136255377e25':
  Fix aapt to get expat header files from the approved location.
 2012-09-09 16:13:11 -07:00
Elliott Hughes
61d09810a7 am 3150feef: am bfe1ab82: Merge "Fix aapt to get expat header files from the approved location." 
* commit '3150feef0b27ad34370904eb12875805f6c84e8a':
  Fix aapt to get expat header files from the approved location.
 2012-09-09 16:11:04 -07:00
Elliott Hughes
3150feef0b am bfe1ab82: Merge "Fix aapt to get expat header files from the approved location." 
* commit 'bfe1ab825731d365fef169deab646d7ceeafc998':
  Fix aapt to get expat header files from the approved location.
 2012-09-09 16:09:15 -07:00
Kenny Root
008180c1d0 am be3267aa: Merge "Add a native library to test APKs" into jb-mr1-dev 
* commit 'be3267aad1faacc0ee767e746018e7b795a9b151':
  Add a native library to test APKs
 2012-09-09 15:21:02 -07:00
Kenny Root
ce2a2ffc67 am 785aaa2d: Merge "Add more testing for native libraries" into jb-mr1-dev 
* commit '785aaa2d19c690248dfdb5db6e589474192709cf':
  Add more testing for native libraries
 2012-09-09 15:19:25 -07:00
Kenny Root
be3267aad1 Merge "Add a native library to test APKs" into jb-mr1-dev 2012-09-09 15:18:35 -07:00
Kenny Root
7a51498905 am 69d6b534: Merge "Update PackageSetting flags when updating" into jb-mr1-dev 
* commit '69d6b534335afc883077927b9abb0f94568d298d':
  Update PackageSetting flags when updating
 2012-09-09 15:17:43 -07:00
Kenny Root
785aaa2d19 Merge "Add more testing for native libraries" into jb-mr1-dev 2012-09-09 15:17:11 -07:00
Elliott Hughes
bfe1ab8257 Merge "Fix aapt to get expat header files from the approved location." 2012-09-09 15:16:45 -07:00
Kenny Root
69d6b53433 Merge "Update PackageSetting flags when updating" into jb-mr1-dev 2012-09-09 15:14:56 -07:00
Kenny Root
e64e097147 Add a native library to test APKs 
In order to make sure we have unpacking and deletion working, add a fake
JNI library to every APK.

This can be expanded in the future to make sure replacement is working
correctly as well.

Change-Id: I1ad04c61df9518429aa17795b8a9d3608791cd8e
 2012-09-09 15:12:16 -07:00
Kenny Root
7e921a157d Add more testing for native libraries 
Make sure that native library paths have the correct permissions and
owners. Also make it easier to do a "String#startsWith" test so we can
get better errors when it fails.

Change the observer to have more sane semantics with a CountDownLatch
instead of weird synchronization on a local variable.

Change-Id: I2437e5ea886d6e6cb8b4edeab80d6053b79857d4
 2012-09-09 15:12:16 -07:00
Kenny Root
5455f6826f Update PackageSetting flags when updating 
Commit 5e03e2ca7d25b899b129baad2dd5eca6bf99d88a moved from
PacakgeParser.Package to PackageSetting which revealed that we weren't
updating the pkgFlags when replacing an existing application.

Add flags to PackageSetting so that deletion of the package later succeeds.

Change-Id: I2e0d4e07da31f48b68601f3f3240966b6e17dbdf
 2012-09-09 15:12:00 -07:00
Guang Zhu
fb997a53d0 am 5de4d989: Merge "Use correct PowerManager call to wake up screen" into jb-mr1-dev 
* commit '5de4d989fbc08cf5135c07a74e2062bf64af95f1':
  Use correct PowerManager call to wake up screen
 2012-09-09 14:48:52 -07:00
Dianne Hackborn
1d0467ae1d am 8727a731: Merge "A little cleanup." into jb-mr1-dev 
* commit '8727a73127dde026a797511d28355868797f0e46':
  A little cleanup.
 2012-09-09 14:48:49 -07:00
Guang Zhu
5de4d989fb Merge "Use correct PowerManager call to wake up screen" into jb-mr1-dev 2012-09-09 14:46:44 -07:00
Dianne Hackborn
8727a73127 Merge "A little cleanup." into jb-mr1-dev 2012-09-09 14:45:58 -07:00