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

87948 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
7ccd703f02 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-24 21:26:10 -07:00
Baligh Uddin
3d8b0d744e Merge "Import translations. DO NOT MERGE" 2012-09-24 21:24:23 -07:00
Philip Milne
8c549d6ffe Merge "Bug #6110465. Optical bounds support for all ViewGroup subclasses." 2012-09-24 20:55:00 -07:00
Romain Guy
96ab4dc1a6 am 592f54c4: am eebe0267: Merge "Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919" into jb-mr1-dev 
* commit '592f54c444caca924fca78ce6af14a3ee7009501':
  Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919
 2012-09-24 20:48:23 -07:00
Romain Guy
592f54c444 am eebe0267: Merge "Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919" into jb-mr1-dev 
* commit 'eebe0267f4116e6f573455311c5776e3631c7cbc':
  Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919
 2012-09-24 20:46:42 -07:00
Romain Guy
eebe0267f4 Merge "Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919" into jb-mr1-dev 2012-09-24 20:44:09 -07:00
Romain Guy
fb9e6cc275 Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext 
Bug #7216919

Change-Id: If2059227d55e8ddb2d2673ee36029c3c92dd9a3d
 2012-09-24 20:18:13 -07:00
Eric Laurent
0b7776c124 am 5194aa56: am a8c48521: Merge "Volume keys control music volume after music stops" into jb-mr1-dev 
* commit '5194aa568f4c928d8ad540a86869ea088f7a2a15':
  Volume keys control music volume after music stops
 2012-09-24 20:12:54 -07:00
Eric Laurent
5194aa568f am a8c48521: Merge "Volume keys control music volume after music stops" into jb-mr1-dev 
* commit 'a8c48521fea4e6a3f358a46e008f005149f2bb35':
  Volume keys control music volume after music stops
 2012-09-24 20:10:11 -07:00
Jim Miller
8f9739ed7c am c8c6b03a: am f794da7b: Merge "Fix wrong password attempt count in DevicePolicyManager" into jb-mr1-dev 
* commit 'c8c6b03af39e726eaefb3ee21b15e19eba05c372':
  Fix wrong password attempt count in DevicePolicyManager
 2012-09-24 20:07:32 -07:00
Eric Laurent
a8c48521fe Merge "Volume keys control music volume after music stops" into jb-mr1-dev 2012-09-24 20:07:14 -07:00
Jim Miller
c8c6b03af3 am f794da7b: Merge "Fix wrong password attempt count in DevicePolicyManager" into jb-mr1-dev 
* commit 'f794da7bd35deba01e6cc66ecea3614f7382698b':
  Fix wrong password attempt count in DevicePolicyManager
 2012-09-24 20:05:47 -07:00
Jim Miller
f794da7bd3 Merge "Fix wrong password attempt count in DevicePolicyManager" into jb-mr1-dev 2012-09-24 20:02:58 -07:00
Jim Miller
7641506e3c Fix wrong password attempt count in DevicePolicyManager 
Keyguard wasn't resetting dpm's count when a successful password
was made.  The result is the device would get wiped earlier than
it should.

Also fixes a TODO left over from keyguard refactoring that
allowed face unlock to trigger the same logic (ouch!).

Fixes bug 7219258

Change-Id: I2bd13c50a9beb8225d3237e86d5e34b73d0eb3cf
 2012-09-24 19:31:29 -07:00
Svetoslav Ganov
ca75451072 am c1c3fd95: am a2b71153: Merge "More than one finger at a time can trigger a system crash." into jb-mr1-dev 
* commit 'c1c3fd95414d4378decee70acce8d000b872c8c9':
  More than one finger at a time can trigger a system crash.
 2012-09-24 19:16:57 -07:00
Svetoslav Ganov
c1c3fd9541 am a2b71153: Merge "More than one finger at a time can trigger a system crash." into jb-mr1-dev 
* commit 'a2b711530f2c71a37cec980af8c66bd523744462':
  More than one finger at a time can trigger a system crash.
 2012-09-24 19:14:59 -07:00
Svetoslav Ganov
a2b711530f Merge "More than one finger at a time can trigger a system crash." into jb-mr1-dev 2012-09-24 19:12:38 -07:00
Svetoslav Ganov
eacc3183e1 am c3961a2c: am 0d7558fc: Merge "Magnified frame not properly computed when keyguard goes away." into jb-mr1-dev 
* commit 'c3961a2c64ff83f91939f102ba3ef99bfc4caf75':
  Magnified frame not properly computed when keyguard goes away.
 2012-09-24 18:59:22 -07:00
Svetoslav Ganov
c3961a2c64 am 0d7558fc: Merge "Magnified frame not properly computed when keyguard goes away." into jb-mr1-dev 
* commit '0d7558fcb6450eb8e2193ecdd285db21b790e1f7':
  Magnified frame not properly computed when keyguard goes away.
 2012-09-24 18:57:20 -07:00
Svetoslav Ganov
0d7558fcb6 Merge "Magnified frame not properly computed when keyguard goes away." into jb-mr1-dev 2012-09-24 18:55:05 -07:00
Brian Muramatsu
1c87a074d7 am 2a78c336: am 7cf3bbc4: Merge "Use global wifi_sleep_policy constants" into jb-mr1-dev 
* commit '2a78c336eef813379f83d6e84e84f2c447d828be':
  Use global wifi_sleep_policy constants
 2012-09-24 18:44:09 -07:00
Doug Zongker
e41633f203 am 2ca11f52: am d7ae127b: Merge "fix argument parser for global settings URLs" into jb-mr1-dev 
* commit '2ca11f527d2e245c963a16f84df7a5bde1e9952f':
  fix argument parser for global settings URLs
 2012-09-24 18:44:06 -07:00
Svetoslav Ganov
03e7b88815 More than one finger at a time can trigger a system crash. 
1. The crash was happening if: two active pointers are performing a drag;
   there are some inactive pointers down; the main dragging pointer (we are
   merging the dragging pointers into one) goes up; now an inactive pointer
   goes up and the explorer tries to inject up for the dragging pointer
   which is no longer in the event resulting in a crash. Basically two
   problems: inactive pointers were not ignored; 2) having only one
   active pointer should not only send the up event but also transition
   the explorer in touch exploring state.

bug:6874128

Change-Id: I341fc360ebc074fe3919d5ba3b98ee5cb08dd71e
 2012-09-24 18:43:30 -07:00
Brian Muramatsu
2a78c336ee am 7cf3bbc4: Merge "Use global wifi_sleep_policy constants" into jb-mr1-dev 
* commit '7cf3bbc4c0af6f3f4e92c51bb2c5e65cd1a499d1':
  Use global wifi_sleep_policy constants
 2012-09-24 18:42:04 -07:00
Doug Zongker
2ca11f527d am d7ae127b: Merge "fix argument parser for global settings URLs" into jb-mr1-dev 
* commit 'd7ae127b1ece1f751a9f57dd118a3ca87a562f3d':
  fix argument parser for global settings URLs
 2012-09-24 18:42:00 -07:00
Brian Muramatsu
7cf3bbc4c0 Merge "Use global wifi_sleep_policy constants" into jb-mr1-dev 2012-09-24 18:39:19 -07:00
Doug Zongker
d7ae127b1e Merge "fix argument parser for global settings URLs" into jb-mr1-dev 2012-09-24 18:39:19 -07:00
Amith Yamasani
7934f2c6d1 am 49610b08: am 9ed67e83: Merge "Fix build" into jb-mr1-dev 
* commit '49610b0833925a62f067f90012893431f1d06ca4':
  Fix build
 2012-09-24 18:20:51 -07:00
Amith Yamasani
49610b0833 am 9ed67e83: Merge "Fix build" into jb-mr1-dev 
* commit '9ed67e83b290f48eb3ee72608dead3a1a160e3da':
  Fix build
 2012-09-24 18:18:53 -07:00
Amith Yamasani
9ed67e83b2 Merge "Fix build" into jb-mr1-dev 2012-09-24 18:16:44 -07:00
Amith Yamasani
16979eab19 Fix build 
Merge error...

Change-Id: I0e674ee25a080fa6abfaa9da893084d6b4fa69a6
 2012-09-24 18:14:47 -07:00
Jeff Brown
3a80b1c868 am 22b5cb91: am 51f36148: Merge "Fix dialogs on secondary displays." into jb-mr1-dev 
* commit '22b5cb917ec27327147a508dc12d928e75d6c1da':
  Fix dialogs on secondary displays.
 2012-09-24 18:08:26 -07:00
Jeff Brown
22b5cb917e am 51f36148: Merge "Fix dialogs on secondary displays." into jb-mr1-dev 
* commit '51f36148b736be9d567c2ccdaf79376cbc3c5553':
  Fix dialogs on secondary displays.
 2012-09-24 18:06:17 -07:00
Jeff Brown
51f36148b7 Merge "Fix dialogs on secondary displays." into jb-mr1-dev 2012-09-24 18:03:44 -07:00
Jason Sams
4ba0f5759e am ea8bffe8: am 6bd69aec: Merge "Test FS getElementAt" into jb-mr1-dev 
* commit 'ea8bffe83ddd4ddd7d0ca9d652ad6e0d51d3826a':
  Test FS getElementAt
 2012-09-24 17:56:52 -07:00
Jason Sams
ea8bffe83d am 6bd69aec: Merge "Test FS getElementAt" into jb-mr1-dev 
* commit '6bd69aec538413fbf6fd9d25ff0b00049ce9a096':
  Test FS getElementAt
 2012-09-24 17:54:55 -07:00
Jason Sams
6bd69aec53 Merge "Test FS getElementAt" into jb-mr1-dev 2012-09-24 17:52:58 -07:00
Amith Yamasani
a1a41f5249 am ccf6bdd9: am 8d8766bc: Merge "AppInfo from Notifications for secondary users" into jb-mr1-dev 
* commit 'ccf6bdd9ba7cc341518b8e87d1d047ab2ebf6894':
  AppInfo from Notifications for secondary users
 2012-09-24 17:51:30 -07:00
Jeff Sharkey
eb758f5b3e am da9b286b: am 7db28b3a: Merge "Move multi-user OBB under user-specific path." into jb-mr1-dev 
* commit 'da9b286bff9b64e68608b1e526c18d731cb644d1':
  Move multi-user OBB under user-specific path.
 2012-09-24 17:51:23 -07:00
Jeff Brown
2fd18b4d23 am 31bf90a2: am c5a2b1a6: Merge changes I8d743b5d,I4ef74691,I21ddb990 into jb-mr1-dev 
* commit '31bf90a2e920065c648e8ea801d6a42e1f6ce4c9':
  Fix surface view on secondary display.
  Fix drag and drop surfaces on secondary displays.
  Allow a window on a secondary display to have focus.
 2012-09-24 17:51:19 -07:00
Jeff Brown
c89644cb41 am c765f3b5: am 3f24678f: Merge "Force activities to run on the second display for testing." into jb-mr1-dev 
* commit 'c765f3b5bb085b1860e0476d8be7d183f9ba44a2':
  Force activities to run on the second display for testing.
 2012-09-24 17:51:15 -07:00
Amith Yamasani
ccf6bdd9ba am 8d8766bc: Merge "AppInfo from Notifications for secondary users" into jb-mr1-dev 
* commit '8d8766bc781f7008bcec385019dc104fc1154987':
  AppInfo from Notifications for secondary users
 2012-09-24 17:46:13 -07:00
Jeff Sharkey
da9b286bff am 7db28b3a: Merge "Move multi-user OBB under user-specific path." into jb-mr1-dev 
* commit '7db28b3a4a4b6a690358c8c4d8dc60e6983465df':
  Move multi-user OBB under user-specific path.
 2012-09-24 17:44:23 -07:00
Amith Yamasani
8d8766bc78 Merge "AppInfo from Notifications for secondary users" into jb-mr1-dev 2012-09-24 17:43:18 -07:00
Jeff Sharkey
7db28b3a4a Merge "Move multi-user OBB under user-specific path." into jb-mr1-dev 2012-09-24 17:42:16 -07:00
Jason Sams
ae760511d8 Test FS getElementAt 
bug 7190126

Change-Id: I1fbaa77af051cf44134f8bfe56339ce5d3b7edbb
 2012-09-24 17:42:14 -07:00
Jeff Brown
31bf90a2e9 am c5a2b1a6: Merge changes I8d743b5d,I4ef74691,I21ddb990 into jb-mr1-dev 
* commit 'c5a2b1a6f30e136dedea1224dee442635c767dde':
  Fix surface view on secondary display.
  Fix drag and drop surfaces on secondary displays.
  Allow a window on a secondary display to have focus.
 2012-09-24 17:41:41 -07:00
Jason Sams
645d3a31fe am 8e55ef65: am c412fb94: Merge "Add test for copy kernels." into jb-mr1-dev 
* commit '8e55ef6552cfeb0905476964ab6a1dfd3ed5b18a':
  Add test for copy kernels.
 2012-09-24 17:40:10 -07:00
Jeff Brown
c765f3b5bb am 3f24678f: Merge "Force activities to run on the second display for testing." into jb-mr1-dev 
* commit '3f24678f238b4ddd6d80040b8882595e0c7ec62e':
  Force activities to run on the second display for testing.
 2012-09-24 17:39:45 -07:00
Jeff Brown
c5a2b1a6f3 Merge changes I8d743b5d,I4ef74691,I21ddb990 into jb-mr1-dev 
* changes:
  Fix surface view on secondary display.
  Fix drag and drop surfaces on secondary displays.
  Allow a window on a secondary display to have focus.
 2012-09-24 17:38:23 -07:00