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

85860 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
658c77cc32 am 2323ec7e: Merge "Notifications: Hide ticker updates from background users." into jb-mr1-dev 
* commit '2323ec7ee1fb614950f2f6891514964d07fd0bd4':
  Notifications: Hide ticker updates from background users.
 2012-09-10 11:09:21 -07:00
John Spurlock
2323ec7ee1 Merge "Notifications: Hide ticker updates from background users." into jb-mr1-dev 2012-09-10 11:07:21 -07:00
Svetoslav Ganov
a422003007 am 7e8f6c4c: Merge "Improve scaling vs pan in screen magnifier." into jb-mr1-dev 
* commit '7e8f6c4cef8d65c5b470fc8700214e28d8cd4d43':
  Improve scaling vs pan in screen magnifier.
 2012-09-10 10:56:41 -07:00
Svetoslav Ganov
7e8f6c4cef Merge "Improve scaling vs pan in screen magnifier." into jb-mr1-dev 2012-09-10 10:54:26 -07:00
Svetoslav Ganov
0c381504a8 Improve scaling vs pan in screen magnifier. 
1. Due to frequent changes of the behavior of ScaleGestureDetector
   this patch rolls in a gesture detector used for changing the
   screen magnification level. It has an improved algorithm which
   uses the diameter of min circle around the points as the span, the
   center of this circle as the focal point, and the average slop
   of the lines from each pointer to the center to determine the
   angle of the diameter used when computing the span x and y.

Change-Id: I5cee8dba84032a0702016b8f9632f78139024bbe
 2012-09-10 10:49:04 -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
Baligh Uddin
7c07cdd668 Import translations. DO NOT MERGE 
Change-Id: I2996f36103f8089ab115bc87c175d4c1ca6e4625
Auto-generated-cl: translation import
 2012-09-10 10:44:19 -07:00
Amith Yamasani
9b4d051784 am 3c1a2011: Merge "Fix DevicePolicyManager crash when settings password quality (and possibly others)." into jb-mr1-dev 
* commit '3c1a20118739fd6765e128c5d9c39c01d22a89e7':
  Fix DevicePolicyManager crash when settings password quality (and possibly others).
 2012-09-10 10:29:48 -07:00
Amith Yamasani
3c1a201187 Merge "Fix DevicePolicyManager crash when settings password quality (and possibly others)." into jb-mr1-dev 2012-09-10 10:27:13 -07:00
Amith Yamasani
b7a685978f Fix DevicePolicyManager crash when settings password quality (and possibly others). 
Bug: 7130570

Clear the calling identity before broadcasting to all users.

Change-Id: Ibe84af1ee00aecfe4b2d5bb7731a952f617b4885
 2012-09-10 10:24:36 -07:00
Chet Haase
beb8bd0db2 Reset GL buffer state after functor invocation 
Functors in WebView were binding to different buffers than we
assumed in the toolkit, eventually causing a crash due to improper
dereferencing in the currently bound buffer. Fix is to reset state
after invoking functors.

Issue #6666279 Native crash in Currents, mostly on Nakasi

Change-Id: I3697812d83613fffc9193daa99beea4dbf26474a
 2012-09-10 08:56:55 -07:00
John Spurlock
61e36836b7 Notifications: Hide ticker updates from background users. 
We should only update the notification ticker area when
the notification is for the current user.

Bug:6924835
Change-Id: Ieaccbd8c972b3d0f62c74d29d42e0fa77ec3148c
 2012-09-10 09:43:27 -04:00
Wu-cheng Li
774f1fca6f am 753e1280: Merge "Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE." into jb-mr1-dev 
* commit '753e1280cbc3f0006b04f67385f02e1f92019f7d':
  Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE.
 2012-09-10 00:51:20 -07:00
Wu-cheng Li
753e1280cb Merge "Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE." into jb-mr1-dev 2012-09-10 00:48:26 -07:00
Irfan Sheriff
649f27a808 am 799553e0: Merge "Fix device list update" into jb-mr1-dev 
* commit '799553e02aa3350397d723982d42198a5bab774c':
  Fix device list update
 2012-09-10 00:38:17 -07:00
Irfan Sheriff
799553e02a Merge "Fix device list update" into jb-mr1-dev 2012-09-10 00:36:17 -07:00
Irfan Sheriff
e298d88458 Fix device list update 
Change-Id: I6a57d90f3750590db4ac5d538956b989d9589501
 2012-09-10 00:34:26 -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
Jamie Gennis
f09263e957 SurfaceTexture: add updateTexImage synchronization 
This change makes the SurfaceTexture JNI updateTexImage call the native
SurfaceTexture's doGLFenceWait method to perform the needed synchronization.

Change-Id: Ie70a1fe6b44d439d1ffe7b97689a421ff8c02fda
 2012-09-09 17:53:27 -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
Elliott Hughes
ee15e15475 Fix aapt to get expat header files from the approved location. 
Change-Id: Ic7c796e048cfe98ee355c18b3708fee5ea716e2e
 2012-09-09 14:45:32 -07:00
Guang Zhu
783f9e6615 Use correct PowerManager call to wake up screen 
The current implementation does not actually wakes up the screen.

Change-Id: Ief2dca013cfe40e03b64273fe7b09822e9ad42a7
 2012-09-09 14:43:09 -07:00
Dianne Hackborn
1b8ecc5031 A little cleanup. 
Change-Id: Ie33fd1b02011606e67ce08df3cce887c07680c60
 2012-09-09 14:41:34 -07:00