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

86617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Burke
33ffed0adc am 348f08f4: Merge "make sure to destroy GL objects on the GL thread" into jb-mr1-dev 
* commit '348f08f468167d56d7f66c59401da8bc69aab746':
  make sure to destroy GL objects on the GL thread
 2012-09-25 21:55:35 -07:00
Dave Burke
348f08f468 Merge "make sure to destroy GL objects on the GL thread" into jb-mr1-dev 2012-09-25 21:53:31 -07:00
Mathias Agopian
54643d72f8 make sure to destroy GL objects on the GL thread 
Bug: 7195815
Change-Id: I5bcac61cd0b903d1ccca0754fdb9cb1023efbe0f
 2012-09-25 21:41:38 -07:00
Matthew Xie
8568915d21 am 5e1c74db: Merge "Remove permission check in registerAdapter" into jb-mr1-dev 
* commit '5e1c74dbbe1ccf93ab13a3cc9e46e98988036762':
  Remove permission check in registerAdapter
 2012-09-25 21:06:49 -07:00
Matthew Xie
5e1c74dbbe Merge "Remove permission check in registerAdapter" into jb-mr1-dev 2012-09-25 21:04:15 -07:00
Dave Burke
ffa6fb83f0 am cefbd143: Merge "Revert "Deleting objects on the wrong thread is a silly idea Bug #7195815"" into jb-mr1-dev 
* commit 'cefbd1438c9054e3a34b4ab93b4b26b427604cb1':
  Revert "Deleting objects on the wrong thread is a silly idea Bug #7195815"
 2012-09-25 20:33:50 -07:00
Dave Burke
cefbd1438c Merge "Revert "Deleting objects on the wrong thread is a silly idea Bug #7195815"" into jb-mr1-dev 2012-09-25 20:31:08 -07:00
Dave Burke
56257aff8a Revert "Deleting objects on the wrong thread is a silly idea Bug #7195815" 
This reverts commit 8a1374946a928fcba7495c87ff6adda327fdfb9f

Change-Id: I53564a6c531d334afcc1fce0bea1e57ae266aa78
 2012-09-25 20:30:09 -07:00
Adam Powell
82c6fa5898 am e8e2b672: Merge "Further tweak touchMajor/Minor stabilization in ScaleGestureDetector" into jb-mr1-dev 
* commit 'e8e2b672563fed2820e392de48226acf894cf06b':
  Further tweak touchMajor/Minor stabilization in ScaleGestureDetector
 2012-09-25 19:38:20 -07:00
Adam Powell
e8e2b67256 Merge "Further tweak touchMajor/Minor stabilization in ScaleGestureDetector" into jb-mr1-dev 2012-09-25 19:35:54 -07:00
Adam Powell
d736d2069b Further tweak touchMajor/Minor stabilization in ScaleGestureDetector 
Change-Id: Ifa717c7dee96c5a2eb18a414a257f01762365b00
 2012-09-25 19:30:44 -07:00
Scott Main
bbad39a1e9 am 9703880d: am 82e7fdfd: am 4f832bc7: am 3b1c5d55: add tip about including android:id for layout state 
* commit '9703880d735b331621d599518a9b0e02c78d0a8c':
  add tip about including android:id for layout state
 2012-09-25 19:10:08 -07:00
Scott Main
9703880d73 am 82e7fdfd: am 4f832bc7: am 3b1c5d55: add tip about including android:id for layout state 
* commit '82e7fdfd47e7de5408c3a0e296475bb1e945f339':
  add tip about including android:id for layout state
 2012-09-25 19:08:15 -07:00
Scott Main
82e7fdfd47 am 4f832bc7: am 3b1c5d55: add tip about including android:id for layout state 
* commit '4f832bc796bad90e5632c3ab69e305b3c7c008ba':
  add tip about including android:id for layout state
 2012-09-25 19:05:35 -07:00
Scott Main
4f832bc796 am 3b1c5d55: add tip about including android:id for layout state 
* commit '3b1c5d55517260516bfa5591ca08bb39d336d511':
  add tip about including android:id for layout state
 2012-09-25 19:03:33 -07:00
Scott Main
3b1c5d5551 add tip about including android:id for layout state 
Change-Id: I9bc9157b320f8a8ac37ab30bc31fb9c457ecf4f6
 2012-09-25 19:01:09 -07:00
Matthew Xie
670ef53353 Remove permission check in registerAdapter 
This matches the JB behavior of getDefaultAdapter public api
bug 6948829

Change-Id: I86135bf45fddbb2d078f855f91a34d6fcce237a2
 2012-09-25 18:25:54 -07:00
Jeff Brown
d36b33f5d4 am 067b4732: Merge "Use more reasonable warning thresholds for power on/off." into jb-mr1-dev 
* commit '067b4732f6e3f3ca5f6005f4c6bd604ca0ba2f1f':
  Use more reasonable warning thresholds for power on/off.
 2012-09-25 18:15:34 -07:00
Jeff Brown
067b4732f6 Merge "Use more reasonable warning thresholds for power on/off." into jb-mr1-dev 2012-09-25 18:13:23 -07:00
Joe Fernandez
0ec877ff61 am be07e6a4: am c80188eb: am 9b516383: am e35d9280: cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 docs: Systrace tool documentation 
* commit 'be07e6a4c08d0220cbde6bf8e3914927a7fef48a':
  cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 docs: Systrace tool documentation
 2012-09-25 18:01:35 -07:00
Joe Fernandez
be07e6a4c0 am c80188eb: am 9b516383: am e35d9280: cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 docs: Systrace tool documentation 
* commit 'c80188ebefbcbe8448fdab0a9f44f02f770f6e8a':
  cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 docs: Systrace tool documentation
 2012-09-25 17:59:43 -07:00
Joe Fernandez
c80188ebef am 9b516383: am e35d9280: cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 docs: Systrace tool documentation 
* commit '9b5163836ccf121af89040c1e465a3f96d37aa7b':
  cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 docs: Systrace tool documentation
 2012-09-25 17:57:56 -07:00
Joe Fernandez
9b5163836c am e35d9280: cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 docs: Systrace tool documentation 
* commit 'e35d9280d6cd5bfca13f9f1c3e8e90636e00c6cf':
  cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 docs: Systrace tool documentation
 2012-09-25 17:56:43 -07:00
Jeff Sharkey
0b0a8c933c am 6e065a72: Merge "Handle multi-user mountObb() requests." into jb-mr1-dev 
* commit '6e065a729dbf08f99209a7710da80442a394ec0d':
  Handle multi-user mountObb() requests.
 2012-09-25 17:54:25 -07:00
Jeff Sharkey
6e065a729d Merge "Handle multi-user mountObb() requests." into jb-mr1-dev 2012-09-25 17:52:14 -07:00
Joe Fernandez
e35d9280d6 cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 
docs: Systrace tool documentation

Change-Id: I85413fad63edd536a18123a5c09abee47051fca6
 2012-09-25 17:52:02 -07:00
Jeff Sharkey
4fbbda4cec Handle multi-user mountObb() requests. 
Since emulated external storage paths differ based on execution
context, carefully fix up paths for various use-cases:

1. When sending paths to DefaultContainerService, always scope
   OBB paths as belonging to USER_OWNER.
2. When sending paths to vold, always build emulated storage paths
   visible to root.
3. Always use the original untouched path when talking with apps.

Mount OBB containers using shared app GID, so that an app can read
the mount point across users.

Handle legacy paths like "/sdcard" by resolving the canonical path
before sending to MountService.  Move tests to servicestests, and
add tests for new path generation logic.

Bug: 7212801
Change-Id: I078c52879cd08d9c8a52cc8c83ac7ced1e8035e7
 2012-09-25 17:34:48 -07:00
Adam Powell
b706633863 am b4693e25: Merge "Smooth out handling of touchMajor/touchMinor in ScaleGestureDetector." into jb-mr1-dev 
* commit 'b4693e25b1a576718eb669a74a056b3f1e451117':
  Smooth out handling of touchMajor/touchMinor in ScaleGestureDetector.
 2012-09-25 17:19:33 -07:00
Adam Powell
b4693e25b1 Merge "Smooth out handling of touchMajor/touchMinor in ScaleGestureDetector." into jb-mr1-dev 2012-09-25 17:17:22 -07:00
Svetoslav Ganov
ba78ebb88a am 2fd6cb04: Merge "Fixing the build" into jb-mr1-dev 
* commit '2fd6cb043901c1bfbf5f566d13522cc3c1c21fb4':
  Fixing the build
 2012-09-25 17:07:54 -07:00
Jeff Brown
876f95ed7f am b32e2216: Merge changes I332f020f,I632648ac into jb-mr1-dev 
* commit 'b32e221699201cb647beae3fe0a1771fd5a41cf4':
  Update references to migrated global settings.
  Handle user switched for settings changes.
 2012-09-25 17:07:46 -07:00
Jeff Brown
7a0184b70c am 0a52088e: Merge "Fix typo." into jb-mr1-dev 
* commit '0a52088e58a6ddea0966ba9cd2fbc7bd3e23809a':
  Fix typo.
 2012-09-25 17:05:12 -07:00
Svetoslav Ganov
2fd6cb0439 Merge "Fixing the build" into jb-mr1-dev 2012-09-25 17:05:04 -07:00
Svetoslav Ganov
063158561e Fixing the build 
Change-Id: Ia3a7051bf26001da019b08d1b718d0a63d6c7919
 2012-09-25 17:03:12 -07:00
Jeff Brown
b32e221699 Merge changes I332f020f,I632648ac into jb-mr1-dev 
* changes:
  Update references to migrated global settings.
  Handle user switched for settings changes.
 2012-09-25 17:03:11 -07:00
Jeff Brown
0a52088e58 Merge "Fix typo." into jb-mr1-dev 2012-09-25 17:02:06 -07:00
Jeff Brown
80cd819a04 Use more reasonable warning thresholds for power on/off. 
To encourage vendors to make power on/off as efficient
and responsive as possible, we log some warnings whenever it
is too slow.  The previous thresholds were a little
unreasonable mainly because we wanted to understand
how long the process tends to take even when it's fast.

Raise the warning limit while still being aggressive about
timings.  Ideally we want the screen to turn on/off within
no more than a few frames.

Bug: 7167820
Change-Id: Id28dbf8c91cefa7ae7544b72887104af7aabccff
 2012-09-25 16:59:58 -07:00
Winson Chung
eb6c0d5d15 am 282c51d3: Merge "Updating time/alarm tiles, fixing issue with empty space under QuickSettings (Bug 7205141, Bug 7222371)" into jb-mr1-dev 
* commit '282c51d3912995308901b45d22d1801eec50df41':
  Updating time/alarm tiles, fixing issue with empty space under QuickSettings (Bug 7205141, Bug 7222371)
 2012-09-25 16:53:53 -07:00
Dianne Hackborn
923e3cc1aa am 61ad1bac: Merge "Fix AbsListView to correctly retain its state if not layed out." into jb-mr1-dev 
* commit '61ad1bacf8985e088c039d90123bf0d2a5de94fe':
  Fix AbsListView to correctly retain its state if not layed out.
 2012-09-25 16:52:08 -07:00
Winson Chung
282c51d391 Merge "Updating time/alarm tiles, fixing issue with empty space under QuickSettings (Bug 7205141, Bug 7222371)" into jb-mr1-dev 2012-09-25 16:51:11 -07:00
Svetoslav Ganov
dfd007884d am c91fb587: Merge "Adding a global accessibility action to open quick settings." into jb-mr1-dev 
* commit 'c91fb5875bfd7f91d50d6fe939873872b53c8b2f':
  Adding a global accessibility action to open quick settings.
 2012-09-25 16:50:05 -07:00
Dianne Hackborn
61ad1bacf8 Merge "Fix AbsListView to correctly retain its state if not layed out." into jb-mr1-dev 2012-09-25 16:49:05 -07:00
Brian Carlstrom
bee07548d5 am fe54290d: Merge "Add a static generator that takes a Socket Write Timeout Argumanet" into jb-mr1-dev 
* commit 'fe54290df0c5d495b7f388035a4ae3a20821a183':
  Add a static generator that takes a Socket Write Timeout Argumanet
 2012-09-25 16:48:18 -07:00
Svetoslav Ganov
c91fb5875b Merge "Adding a global accessibility action to open quick settings." into jb-mr1-dev 2012-09-25 16:47:06 -07:00
Jason Sams
0e784cb3b0 am 0c622570: Merge "Reduce test warmup time to avoid driving into thermal throttle." into jb-mr1-dev 
* commit '0c622570799977a5efab2357b134e38c21ce009b':
  Reduce test warmup time to avoid driving into thermal throttle.
 2012-09-25 16:46:30 -07:00
Brian Carlstrom
fe54290df0 Merge "Add a static generator that takes a Socket Write Timeout Argumanet" into jb-mr1-dev 2012-09-25 16:46:09 -07:00
Winson Chung
c86b23b9a6 Updating time/alarm tiles, fixing issue with empty space under QuickSettings (Bug 7205141, Bug 7222371) 
Change-Id: If42308a0bbc4a31ffb7f5f0b66063c3b1418ca3e
 2012-09-25 16:44:29 -07:00
Jason Sams
0c62257079 Merge "Reduce test warmup time to avoid driving into thermal throttle." into jb-mr1-dev 2012-09-25 16:42:10 -07:00
Romain Guy
5ef5816b52 am 5d50ab7c: Merge "Deleting objects on the wrong thread is a silly idea Bug #7195815" into jb-mr1-dev 
* commit '5d50ab7cbaa4fe63783730974de69c07ef7e85d5':
  Deleting objects on the wrong thread is a silly idea Bug #7195815
 2012-09-25 16:36:37 -07:00
Romain Guy
5d50ab7cba Merge "Deleting objects on the wrong thread is a silly idea Bug #7195815" into jb-mr1-dev 2012-09-25 16:34:04 -07:00