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

85288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chet Haase
d48478e4c6 Merge "Assign default texture id of 0" into jb-mr1-dev 2012-09-26 11:06:38 -07:00
Xavier Ducrohet
f8b18ced26 am 4649d03b: (-s ours) am 6c6ddbff: Fix writing text version of styleable IDs. do not merge. 
* commit '4649d03b96f576c4a7d5d4aa7d7d637a6ae091aa':
  Fix writing text version of styleable IDs. do not merge.
 2012-09-26 11:06:03 -07:00
Xavier Ducrohet
4649d03b96 am 6c6ddbff: Fix writing text version of styleable IDs. do not merge. 
* commit '6c6ddbff890afb2133f6da79237cf581f00c13ba':
  Fix writing text version of styleable IDs. do not merge.
 2012-09-26 11:03:45 -07:00
Chet Haase
98d3a64ffa Assign default texture id of 0 
Some logic depends on a default value of 0, which was not being
assigned.

Issue #7195815 chrome url bar is corrupted
Issue #7190656 Textures corrupted on mr1

Change-Id: I346b7b76e885bf8f04740e711fd88f917a5418c7
 2012-09-26 11:01:42 -07:00
Xavier Ducrohet
6c6ddbff89 Fix writing text version of styleable IDs. do not merge. 
(cherry picked from commit d16047434bca24b2811de7ea9d22de6ee0f87f79)

Change-Id: Ia1fc343e0649b175d290357f63eebec0dd1ae14a
 2012-09-26 11:00:41 -07:00
Jeff Sharkey
65c4a2b26c Multi-user ringtone playback. 
Change RingtonePlayer to open content:// Uris based on requesting
UserHandle.  Grant SystemUI visibility to all emulated storage so
it can play ringtones for apps without READ_EXTERNAL_STORAGE.

Resolve canonical file:// Uris before passing out of source app,
replacing any /emulated_legacy/-style paths with user-specific
variant so they can be opened by SystemUI.  Calling for RemoteViews,
Ringtones, and Notifications.

Bug: 7202982
Change-Id: Ibf0eca8df80c1486711144a7b648f464aadfe099
 2012-09-26 10:49:35 -07:00
John Spurlock
f41f505fac Dream metadata now specified using an xml-resource. 
Removed old metadata key for dream settings activity, now defined in attrs.xml.

Also took this opportunity to remove Dream#lightsOut.

Bug:7172816
Bug:7211867
Change-Id: Ied18a527d2dc2aacc19d7a9543f090653232f0ed
 2012-09-26 12:44:39 -04:00
Xia Wang
3272a38dbc Fix Wifi Stress test after wifi settings are moved to Settings.global 
Change-Id: I823e99b39bc340683b686bb0dd43a473865656f0
 2012-09-26 09:23:59 -07:00
Glenn Kasten
2832136bb6 Merge "Implement android.media.AudioManager.getProperty()" into jb-mr1-dev 2012-09-26 08:51:33 -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
4e1ab15b30 Enable multi-user function for IMF 
Bug: 6931482

Change-Id: Ib23849d352db33f0747aa9d5a178f00ac726c13b
 2012-09-26 19:22:04 +09: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
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
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
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
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
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
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
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
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
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
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
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
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
Glenn Kasten
c6c4365ddb Implement android.media.AudioManager.getProperty() 
Bug: 6635041
Change-Id: I0e7d53b99559cdc89f2f107f23048e4b1a8dd383
 2012-09-25 17:01:40 -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
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
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
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
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