Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,711 Commits 3 Branches 0 Tags
9d37dfd4cc4ee496a53900c45df91f4e3b62d3c6
Commit Graph

8549 Commits

Author SHA1 Message Date
Amith Yamasani
9d37dfd4cc am 58cb80f6: am 1d31d5ba: Merge "Start userId from 10, reserving 1-9 for special use in the future." into jb-mr1-dev 
* commit '58cb80f6ce61156953b52e3f48409475077a726f':
  Start userId from 10, reserving 1-9 for special use in the future.
 2012-09-17 15:01:28 -07:00
Amith Yamasani
1d31d5ba12 Merge "Start userId from 10, reserving 1-9 for special use in the future." into jb-mr1-dev 2012-09-17 14:56:03 -07:00
Amith Yamasani
07a0ede729 Start userId from 10, reserving 1-9 for special use in the future. 
Change-Id: I3d0c1717d8b3add75ba43ed98e53ba02e6682c34
 2012-09-17 14:54:26 -07:00
Jeff Brown
1a66bd5150 am 39b9c91e: am e2fb5190: Merge "Swap remote submix initialization order." into jb-mr1-dev 
* commit '39b9c91ebf8ad937cb80c521e923e1bf713a6716':
  Swap remote submix initialization order.
 2012-09-17 14:54:23 -07:00
Amith Yamasani
4a1e7e3c59 am 83385ecc: am e645324e: Merge "Add UserManager.getUserIcon()" into jb-mr1-dev 
* commit '83385eccc5274443d90d4c4dc821e6281fee4af6':
  Add UserManager.getUserIcon()
 2012-09-17 14:54:05 -07:00
Craig Mautner
45bb2d4f2c am d8132081: am 178af594: Add debug to help with b/7135184. 
* commit 'd8132081b57233b7dda9863a6c51693d5971cd30':
  Add debug to help with b/7135184.
 2012-09-17 14:53:36 -07:00
Irfan Sheriff
0f0e58ccf2 am 1fa0aa29: am 89c82814: Merge "Add restoreCallingIdentity under finally" into jb-mr1-dev 
* commit '1fa0aa291ba1fd499b312fb2c8a5dcf288751606':
  Add restoreCallingIdentity under finally
 2012-09-17 14:46:03 -07:00
Dianne Hackborn
9905a8d4bb am 68128325: am 443e4748: Merge "Fix issue #7175553: GRANT_URI_PERMISSION doesn\'t apper to work on secondary user" into jb-mr1-dev 
* commit '681283257d6ff4f77a5ca66a0e7ad51c90320db6':
  Fix issue #7175553: GRANT_URI_PERMISSION doesn't apper to work on secondary user
 2012-09-17 14:45:54 -07:00
Irfan Sheriff
9fe955c4fc am e3141345: am db831da4: Fix permission accessing getCurrentUser 
* commit 'e3141345d81a0f667bb3980e28183bb95a281215':
  Fix permission accessing getCurrentUser
 2012-09-17 14:45:51 -07:00
rich cannings
088967f9bb am 35fc1145: am 97e7c59c: Merge "Enable package verification" into jb-mr1-dev 
* commit '35fc1145a56f0a739c3ba065499174f49d98a137':
  Enable package verification
 2012-09-17 14:45:32 -07:00
Iliyan Malchev
97fe30d658 am 793126fe: am 86e85efe: Merge "Set backlight brightness in correct order." into jb-mr1-dev 
* commit '793126fe63043d5f07d260ffed7ac938cd1f1a22':
  Set backlight brightness in correct order.
 2012-09-17 14:45:28 -07:00
Irfan Sheriff
a8aead0a48 am e3dc7055: am 3849490c: Merge "Return empty scan results for background user" into jb-mr1-dev 
* commit 'e3dc7055cddbadc04e51003f17ab4dbdbb6f58df':
  Return empty scan results for background user
 2012-09-17 14:45:07 -07:00
Craig Mautner
7ecd0387d2 am 2386be50: am a91f9e29: Make more items per-Display. 
* commit '2386be50d03df41d183fe0017c7560e078374439':
  Make more items per-Display.
 2012-09-17 14:44:18 -07:00
Dianne Hackborn
397c1d8467 am 0fd909ba: am d65afc65: Merge "More multi-user stuff." into jb-mr1-dev 
* commit '0fd909bad1151cc39061abb52ae5b8be090e05dd':
  More multi-user stuff.
 2012-09-17 14:44:10 -07:00
Dianne Hackborn
c2ce886339 am 6b655130: am 398bad04: Merge "Fix debug log." into jb-mr1-dev 
* commit '6b655130e7258da1aa40860e58852f9f5370bfbd':
  Fix debug log.
 2012-09-17 14:44:05 -07:00
Jeff Sharkey
40210f98ba am 06f01326: am d0c6ccba: Move NetworkPolicy from apps to UID. 
* commit '06f01326dfd9e2ee557fd817481081bc3f36e35e':
  Move NetworkPolicy from apps to UID.
 2012-09-17 14:43:36 -07:00
Jeff Brown
e2fb51900c Merge "Swap remote submix initialization order." into jb-mr1-dev 2012-09-17 13:32:41 -07:00
Christopher Tate
5067ea3751 am 5bae602c: am 2892dfbe: Merge "Fix default population of wifi settings" into jb-mr1-dev 
* commit '5bae602cbbb96af3290d430ab25600149d4d073d':
  Fix default population of wifi settings
 2012-09-17 12:47:03 -07:00
Amith Yamasani
e645324e6b Merge "Add UserManager.getUserIcon()" into jb-mr1-dev 2012-09-17 12:46:01 -07:00
rich cannings
ecfc9d8253 am d063b14d: am 0b62fa23: Merge "Send more information to verifiers" into jb-mr1-dev 
* commit 'd063b14dc8ef3cdf63d658b5375bf84b5cb1dc02':
  Send more information to verifiers
 2012-09-17 12:45:31 -07:00
Svetoslav Ganov
f701d1eb71 am 873d49a6: am 8b681cb8: Some formatting missed in the previous patch 
* commit '873d49a670df369c6ad5d125581fdc182114d05b':
  Some formatting missed in the previous patch
 2012-09-17 12:45:18 -07:00
Svetoslav Ganov
664222b066 am acbea737: am 3efa8bab: Merge "Adding accessibility events for touch and gesture detection states." into jb-mr1-dev 
* commit 'acbea737ec97f0fd15f2818196495b2355094065':
  Adding accessibility events for touch and gesture detection states.
 2012-09-17 12:45:14 -07:00
Amith Yamasani
3b49f07a45 Add UserManager.getUserIcon() 
So that we don't abuse the setUserIcon() for reading. So the new method won't try
to create the file, only return it if it exists.

Change-Id: I7a81d3f1b29d14d37e71f531744ce39f21d827ac
 2012-09-17 12:42:00 -07:00
Jeff Brown
c9bd4ca005 Swap remote submix initialization order. 
Need to turn the submix on before connecting and off
after disconnecting.

Change-Id: I53389c3b61e6d663855accd0461eed42a67d9d2b
 2012-09-17 12:24:43 -07:00
Craig Mautner
178af5948d Add debug to help with b/7135184. 
Change-Id: I0d3b60b3e123d35bd557d47e3344ebea1964380b

Conflicts:

	services/java/com/android/server/wm/WindowAnimator.java
 2012-09-17 11:33:25 -07:00
Ben Gruver
bb12a413db am 552edb89: am 51fbaff1: Merge "DEFAULT_VERIFY_ENABLE turns verification off" into jb-mr1-dev 
* commit '552edb895a17c8cd1d6b653cbe206aa612a6f43c':
  DEFAULT_VERIFY_ENABLE turns verification off
 2012-09-17 11:29:17 -07:00
Jeff Sharkey
67bbcd036a am 1e364aca: am 04a34b37: Merge "Actually move to Global settings." into jb-mr1-dev 
* commit '1e364acac6f4768672deb73485e93c32929e25fd':
  Actually move to Global settings.
 2012-09-17 11:10:16 -07:00
Christopher Tate
28983b10ab am e9431fa8: am ce18d1c8: Merge "Get correct user\'s package info during clip processing" into jb-mr1-dev 
* commit 'e9431fa8815ebd9887482a6b2848188d2786279b':
  Get correct user's package info during clip processing
 2012-09-17 11:10:11 -07:00
Jeff Sharkey
ddf93f9503 am 892bf6c6: am a043c2c0: Merge "Move to Global.NETSTATS and Global.NTP constants." into jb-mr1-dev 
* commit '892bf6c607127ae8405fd589ae70023e457844f5':
  Move to Global.NETSTATS and Global.NTP constants.
 2012-09-17 11:10:05 -07:00
Jim Miller
391513a0a8 am e98aef73: am f229e4d3: Add support for settings for lock widgets 
* commit 'e98aef734657cc129143a4a25ee78ade48d34037':
  Add support for settings for lock widgets
 2012-09-17 11:09:55 -07:00
Michael Jurka
a5ad62adfa am 0cae2597: am ad92ce85: Merge "Fix bug with getting widget categories" into jb-mr1-dev 
* commit '0cae2597b21a266862bd0fdcbf12a6133d393c2c':
  Fix bug with getting widget categories
 2012-09-17 11:09:40 -07:00
Kenny Root
11af0000ef am 28c709d3: am a96fa35e: Merge "Don\'t prematurely delete temporary files" into jb-mr1-dev 
* commit '28c709d35ecc141162c1e024022dd44553b9cc43':
  Don't prematurely delete temporary files
 2012-09-17 10:28:49 -07:00
Irfan Sheriff
89c82814db Merge "Add restoreCallingIdentity under finally" into jb-mr1-dev 2012-09-16 18:53:25 -07:00
Dianne Hackborn
443e474881 Merge "Fix issue #7175553: GRANT_URI_PERMISSION doesn't apper to work on secondary user" into jb-mr1-dev 2012-09-16 18:07:14 -07:00
Irfan Sheriff
3d33a63391 Add restoreCallingIdentity under finally 
Change-Id: I068b1a2fc93300aa9bd17da6933bc8c5f0a6b5e4
 2012-09-16 17:59:13 -07:00
Irfan Sheriff
db831da426 Fix permission accessing getCurrentUser 
Bug: 7174737
Change-Id: I0a6a9a46f4115743d16ada401cd67e3cf30fb380
 2012-09-16 17:40:59 -07:00
Dianne Hackborn
11f0cb7d07 Fix issue #7175553: GRANT_URI_PERMISSION doesn't apper to work on secondary user 
Change-Id: I0ab372978f8599d0fe8d5da8aeb73965ab85797f
 2012-09-16 17:12:34 -07:00
rich cannings
97e7c59c5f Merge "Enable package verification" into jb-mr1-dev 2012-09-16 16:30:25 -07:00
Iliyan Malchev
86e85efe9b Merge "Set backlight brightness in correct order." into jb-mr1-dev 2012-09-16 16:27:47 -07:00
rich cannings
36c67c236e Enable package verification 
Turn on package verification, if a verifier exists. Play app is a verifier.

Bug: 7064853
Change-Id: Id7d478a216d10b0a612678d6a9b0ee7f2037204a
 2012-09-16 16:20:23 -07:00
Jeff Brown
735f740fe8 Set backlight brightness in correct order. 
Disable backlight before turning off the screen.
Enable backlight after turning on the screen.

Bug: 7016215
Change-Id: Idb763f85f7a40e852483c57e0a0d1b27eb943f08
 2012-09-16 16:15:38 -07:00
Irfan Sheriff
3849490c63 Merge "Return empty scan results for background user" into jb-mr1-dev 2012-09-16 15:23:55 -07:00
Irfan Sheriff
330b187574 Return empty scan results for background user 
Bug: 7087342
Change-Id: I62493e5004111311b7ac9b7610c85e6784e2c7e4
 2012-09-16 12:39:06 -07:00
Craig Mautner
a91f9e2959 Make more items per-Display. 
Moving DimSurfaces, DimBackgrounds and Rotation surfaces into
per-display class.

Fixes bug 7167028.

Change-Id: I7408b3a27b5a7a8d0d59e9d6109c002fc627e536
 2012-09-16 10:44:06 -07:00
Dianne Hackborn
d65afc65ea Merge "More multi-user stuff." into jb-mr1-dev 2012-09-16 00:05:46 -07:00
Dianne Hackborn
398bad04a0 Merge "Fix debug log." into jb-mr1-dev 2012-09-16 00:03:39 -07:00
Dianne Hackborn
5dc5a00e7e More multi-user stuff. 
- New public APIs to find out when a user goes to the foreground,
  background, and is first initializing.
- New activity manager callback to be involved in the user switch
  process, allowing other services to let it know when it is safe
  to stop freezing the screen.
- Wallpaper service now implements this to handle its user switch,
  telling the activity manager when it is done.  (Currently this is
  only handling the old wallpaper going away, we need a little more
  work to correctly wait for the new wallpaper to get added.)
- Lock screen now implements the callback to do its user switch.  It
  also now locks itself when this happens, instead of relying on
  some other entity making sure it is locked.
- Pre-boot broadcasts now go to all users.
- WallpaperManager now has an API to find out if a named wallpaper is
  in use by any users.

Change-Id: I27877aef1d82126c0a1428c3d1861619ee5f8653
 2012-09-15 23:58:55 -07:00
Jeff Sharkey
d0c6ccbafd Move NetworkPolicy from apps to UID. 
For multi-user devices, switch to storing policy per-user instead of
per-app.  Also watch for user added/removed broadcasts to clean up
policies and apply global restrictions.

Bug: 7121279
Change-Id: Ia7326bd0ebe0586fa4ec6d3a62f6313dc8814007
 2012-09-14 23:00:27 -07:00
Christopher Tate
2892dfbeaf Merge "Fix default population of wifi settings" into jb-mr1-dev 2012-09-14 17:59:00 -07:00
Christopher Tate
6f5a9a9652 Fix default population of wifi settings 
Various wifi settings that are explicitly defaulted did not get their
default code properly converted to refer to the correct settings
database table.

A collection of moved-to-Global settings that had not yet been
marked @deprecated in the Secure.* namespace are now so marked.

Also updated the namespace used to refer to wifi settings from the
Wifi Service.  These changes are cosmetic, but they do eliminate a
number of runtime log messages.

Bug 7153671

Change-Id: I9e5b6464d025cfb480ef97373996e38e82f90593
 2012-09-14 17:57:35 -07:00