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

85955 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
2832136bb6 Merge "Implement android.media.AudioManager.getProperty()" into jb-mr1-dev 2012-09-26 08:51:33 -07:00
Victoria Lease
b1a35bdee9 am 72a37470: Merge "getBestProvider() prefers GPS over NLP" into jb-mr1-dev 
* commit '72a374705d32cf715443aa203f75c159e1bc9bd5':
  getBestProvider() prefers GPS over NLP
 2012-09-26 08:01:08 -07:00
Victoria Lease
72a374705d Merge "getBestProvider() prefers GPS over NLP" into jb-mr1-dev 2012-09-26 07:59:13 -07:00
Satoshi Kataoka
d53a08877d am 4e1ab15b: Enable multi-user function for IMF 
* commit '4e1ab15b305aac26ad8819fc3b2951e20985944d':
  Enable multi-user function for IMF
 2012-09-26 03:25:07 -07:00
Satoshi Kataoka
4e1ab15b30 Enable multi-user function for IMF 
Bug: 6931482

Change-Id: Ib23849d352db33f0747aa9d5a178f00ac726c13b
 2012-09-26 19:22:04 +09:00
Kenny Root
27b4d08bfb am f05d511b: Merge "LockScreen: only set keystore password for owner" into jb-mr1-dev 
* commit 'f05d511bc95c5d0bdfa6d64c6a8a02c6a099703f':
  LockScreen: only set keystore password for owner
 2012-09-25 23:38:22 -07:00
Kenny Root
f05d511bc9 Merge "LockScreen: only set keystore password for owner" into jb-mr1-dev 2012-09-25 23:35:56 -07:00
Dave Burke
75fc1b4985 am ca68f4a3: Merge "Remove WifiStateTracker code tracking wifi p2p" into jb-mr1-dev 
* commit 'ca68f4a32f7712876cad59ceff768c37c334214c':
  Remove WifiStateTracker code tracking wifi p2p
 2012-09-25 23:32:33 -07:00
Dave Burke
ca68f4a32f Merge "Remove WifiStateTracker code tracking wifi p2p" into jb-mr1-dev 2012-09-25 23:30:48 -07:00
Irfan Sheriff
0f08b813bb Remove WifiStateTracker code tracking wifi p2p 
This code was never supposed to have been there. It just remained
from an old implementation and actually results in
CS getting the wrong network info when both wifi and p2p are connected

Exposing p2p network type to CS needs to be done differently.

Bug: 7233984
Change-Id: I84a6091b8236cf5bdfcef3e7f626163d629e372d
 2012-09-25 23:02:47 -07:00
Mathias Agopian
8562887a75 am 17ef62cc: fix a possible dead-lock when clearing caches 
* commit '17ef62cc1f9d092669af0fed465a9a77e0dc1a4f':
  fix a possible dead-lock when clearing caches
 2012-09-25 22:59:46 -07:00
Kenny Root
df8bfe0cf6 LockScreen: only set keystore password for owner 
Since KeyStore doesn't support multi-user, only unlock or set the
password on the keystore when the "owner" enters a password.

Bug: 7169463
Change-Id: I97b4ba714dc6e400a6e45825c71f81c4629392d8
 2012-09-25 22:57:41 -07:00
Mathias Agopian
17ef62cc1f fix a possible dead-lock when clearing caches 
Bug: 7195815
Change-Id: I8e226b7ec445f9f4fe46ae216ef7cc41efc5a0fd
 2012-09-25 22:52:40 -07:00
Dave Burke
2892f486a1 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:56:19 -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
Stephen Hines
8d60b1ea29 Restore RSTest functionality (char bug is fixed). 
Bug: 6865598
Change-Id: If65ff3c29b28c1008fbf1ad91a92b54210d60547
 2012-09-25 21:08:38 -07:00
Matthew Xie
709aae3bd1 am 5e1c74db: Merge "Remove permission check in registerAdapter" into jb-mr1-dev 
* commit '5e1c74dbbe1ccf93ab13a3cc9e46e98988036762':
  Remove permission check in registerAdapter
 2012-09-25 21:06:25 -07:00
Matthew Xie
5e1c74dbbe Merge "Remove permission check in registerAdapter" into jb-mr1-dev 2012-09-25 21:04:15 -07:00
Stephen Hines
d895d37e27 RS char bug repro case 
Bug: 6865598

Change-Id: Ic43002e0b0646af7eda1b2283e4df7db8dfcf68b
 2012-09-25 20:47:09 -07:00
Dave Burke
706c92187e 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:22 -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
3caf305efd 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:29 -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
2dcc23a490 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:16 -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
2735b807e7 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:48 -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
5ba2d27024 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:43 -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
558f6d654f am 6e065a72: Merge "Handle multi-user mountObb() requests." into jb-mr1-dev 
* commit '6e065a729dbf08f99209a7710da80442a394ec0d':
  Handle multi-user mountObb() requests.
 2012-09-25 17:53:35 -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
1f16daf7e2 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:30 -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
Dianne Hackborn
3992645bf3 More activity tests. 
Change-Id: Id381ee2db55b135a0734c193fce44c55ef1cdae6
 2012-09-25 17:14:22 -07:00
Svetoslav Ganov
e54a7c3e59 am 2fd6cb04: Merge "Fixing the build" into jb-mr1-dev 
* commit '2fd6cb043901c1bfbf5f566d13522cc3c1c21fb4':
  Fixing the build
 2012-09-25 17:08:21 -07:00
Jeff Brown
3476cb8ec2 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:05:56 -07:00
Svetoslav Ganov
2fd6cb0439 Merge "Fixing the build" into jb-mr1-dev 2012-09-25 17:05:04 -07:00
Jeff Brown
f5cbed0177 am 0a52088e: Merge "Fix typo." into jb-mr1-dev 
* commit '0a52088e58a6ddea0966ba9cd2fbc7bd3e23809a':
  Fix typo.
 2012-09-25 17:04:02 -07:00
Svetoslav Ganov
063158561e Fixing the build 
Change-Id: Ia3a7051bf26001da019b08d1b718d0a63d6c7919
 2012-09-25 17:03:12 -07:00