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

10374 Commits

Author SHA1 Message Date
Jeff Brown
496e48466f am d07934db: am 20ec8ac5: Merge "Improve Wifi display discovery API." into jb-mr1-dev 
* commit 'd07934dbc60d3f52c8133ae8249ef3d609ff2751':
  Improve Wifi display discovery API.
 2012-09-10 17:10:40 -07:00
Amith Yamasani
b69fc7b54c am 46148f22: am 8f008e73: Merge "More multi-user methods in PM" into jb-mr1-dev 
* commit '46148f22650e4e390a9488a2d31d0acd641eeffa':
  More multi-user methods in PM
 2012-09-10 17:10:32 -07:00
Jeff Brown
50098f820c am 367d2e7b: am 8e810132: Merge "Make display manager tell input system about viewports." into jb-mr1-dev 
* commit '367d2e7b74ce16cadd5d3890013acd4d1a0ac022':
  Make display manager tell input system about viewports.
 2012-09-10 17:10:29 -07:00
Jeff Brown
b61469c513 am de758bd0: am 1edf63ef: Merge "Enable auto-brightness adjustment feature with system prop." into jb-mr1-dev 
* commit 'de758bd07df9bacb2c95ba9d00b3693b4e40b96b':
  Enable auto-brightness adjustment feature with system prop.
 2012-09-10 17:10:19 -07:00
Jeff Brown
b6e9976497 am fb7a8045: am b0d10aa9: Merge "Add new wifi display discovery API." into jb-mr1-dev 
* commit 'fb7a80459206322468144029c06e38c084b35255':
  Add new wifi display discovery API.
 2012-09-10 17:10:14 -07:00
Jeff Brown
b53f6ddb00 am 10d49dcf: am 0597100f: Merge "Retry wifi display connections." into jb-mr1-dev 
* commit '10d49dcf3d2c4b04657c038ec2dc0654fba34233':
  Retry wifi display connections.
 2012-09-10 17:10:10 -07:00
Christopher Tate
a22f02a256 am a59441c9: am 4ea283a0: Merge "Sanity-check existence of restore agent" into jb-mr1-dev 
* commit 'a59441c9a90f9dc12a205e42404bb7516ee69be6':
  Sanity-check existence of restore agent
 2012-09-10 17:09:44 -07:00
Dianne Hackborn
234f00b9e8 am 789203ec: am 5d75052b: Merge "Add Binder.getCallingUserHandle()." into jb-mr1-dev 
* commit '789203ec530e61f7678c9883a67135bf8cd3c679':
  Add Binder.getCallingUserHandle().
 2012-09-10 17:09:33 -07:00
Dianne Hackborn
452b1ce2d4 am 3374ada6: am 824b959d: Merge "Explicitly specify current user everywhere home is started." into jb-mr1-dev 
* commit '3374ada6ef0d8368b5fba38ee12c6ff9d5de8800':
  Explicitly specify current user everywhere home is started.
 2012-09-10 17:09:15 -07:00
Jeff Brown
1bfb3323c7 am 131b15a5: am 4d0b5625: Disable hardcoded wifi display adapter. 
* commit '131b15a5a6040ec5667f9a94ac7bca775b4abcfd':
  Disable hardcoded wifi display adapter.
 2012-09-10 17:09:10 -07:00
Svetoslav Ganov
fd6b02884c am c0befe6a: am 0458a69d: Merge "Fixing off by one error in the ScreenMagnifier." into jb-mr1-dev 
* commit 'c0befe6aff6b89b8811e965d9f6ccb368900a1d3':
  Fixing off by one error in the ScreenMagnifier.
 2012-09-10 17:08:59 -07:00
Jeff Brown
4ef8108b7d am 36bae4b5: am 72018294: Merge "Make mirroring automatic based on Windows on display." into jb-mr1-dev 
* commit '36bae4b50a6f132468b1a31ad5520e70796bcfc4':
  Make mirroring automatic based on Windows on display.
 2012-09-10 17:08:37 -07:00
Jeff Brown
8eee7890c1 am 54b7362c: am 7017e483: Merge "Add support for Wifi display." into jb-mr1-dev 
* commit '54b7362cd676e34a9492eba4b463d04b454b26d8':
  Add support for Wifi display.
 2012-09-10 17:08:33 -07:00
Nick Kralevich
93e62e2e18 am 4088457d: am cd620591: Merge "installd: fix forward locking symlink" into jb-mr1-dev 
* commit '4088457d91ee4578369471e9d2ea127b799399bf':
  installd: fix forward locking symlink
 2012-09-10 17:08:30 -07:00
rich cannings
c491c1bf06 am d6870d9a: am 1275abd0: Merge "Move verification settings to Settings.Global" into jb-mr1-dev 
* commit 'd6870d9a3d9a9104ae54abfbd2876206c180b925':
  Move verification settings to Settings.Global
 2012-09-10 17:08:26 -07:00
Dianne Hackborn
e062bf6204 am ca02a46d: am cd42ce5d: Merge "Fix crash when setting wallpaper from non-primary user." into jb-mr1-dev 
* commit 'ca02a46dab9607331486d5f6c2189bae42a64592':
  Fix crash when setting wallpaper from non-primary user.
 2012-09-10 17:08:22 -07:00
Craig Mautner
258833a0d9 am 7ff30583: am df4a94e2: Merge "Fix incorrect indexing calculation." into jb-mr1-dev 
* commit '7ff30583962b0ab9e37747e4b56cb7a619fb8561':
  Fix incorrect indexing calculation.
 2012-09-10 17:08:19 -07:00
Amith Yamasani
f0d067ba44 am 4cf05484: am 5fc62663: Merge "Resolve the correct home intent for secondary users" into jb-mr1-dev 
* commit '4cf0548452493cabbb7f7c09ab3ecb2ebe77ff8e':
  Resolve the correct home intent for secondary users
 2012-09-10 17:07:59 -07:00
Christopher Tate
e6de051799 am 20779a1a: am d6a53c31: Merge "Refer to STAY_ON_WHILE_PLUGGED_IN via the Global namespace" into jb-mr1-dev 
* commit '20779a1ace8322064575f03d10598650ba91181c':
  Refer to STAY_ON_WHILE_PLUGGED_IN via the Global namespace
 2012-09-10 17:07:28 -07:00
Christopher Tate
bb8234b85b am f1c675bc: am c0be8c85: Merge "Refer to STAY_ON_WHILE_PLUGGED_IN in the global namespace" into jb-mr1-dev 
* commit 'f1c675bccd4efccb5acb982602943befa85ed660':
  Refer to STAY_ON_WHILE_PLUGGED_IN in the global namespace
 2012-09-10 17:06:39 -07:00
Dianne Hackborn
3f6f96b526 am 00b7d2a0: am 649d0d71: Merge "More multi-user stuff:" into jb-mr1-dev 
* commit '00b7d2a0de5d235f7eab721d4369bf93af512351':
  More multi-user stuff:
 2012-09-10 17:06:32 -07:00
Jeff Brown
20ec8ac586 Merge "Improve Wifi display discovery API." into jb-mr1-dev 2012-09-09 00:23:59 -07:00
Jeff Brown
180bbc7181 Improve Wifi display discovery API. 
Change-Id: I4d46503e5413f52da16f79bbc9c631cc5ae9c178
 2012-09-08 23:15:00 -07:00
Amith Yamasani
8f008e737a Merge "More multi-user methods in PM" into jb-mr1-dev 2012-09-08 20:20:57 -07:00
Amith Yamasani
151ec4c9f8 More multi-user methods in PM 
pm can list installed packages by user now.

Bug: 6926465

Change-Id: I822311bfd6e7e2d6fb315fc484739fbf953c9bb6
 2012-09-08 19:14:00 -07:00
Jeff Brown
8e81013231 Merge "Make display manager tell input system about viewports." into jb-mr1-dev 2012-09-08 18:19:14 -07:00
Jeff Brown
d728bf514f Make display manager tell input system about viewports. 
The window manager is no longer responsible for telling the
input system about the display viewport.

Change-Id: I932882bae55decef55f25093bb2a7ebac1620bb1
 2012-09-08 18:12:57 -07:00
Jeff Brown
1edf63ef4c Merge "Enable auto-brightness adjustment feature with system prop." into jb-mr1-dev 2012-09-08 15:53:50 -07:00
Jeff Brown
631938f26d Enable auto-brightness adjustment feature with system prop. 
This feature is experimental and disabled by default.

Change-Id: I183534370da7613557e4d1535f556873f8a763df
 2012-09-08 15:11:11 -07:00
Jeff Brown
b0d10aa983 Merge "Add new wifi display discovery API." into jb-mr1-dev 2012-09-08 14:55:02 -07:00
Jeff Brown
0597100f91 Merge "Retry wifi display connections." into jb-mr1-dev 2012-09-08 14:53:58 -07:00
Jeff Brown
e08ae388d6 Add new wifi display discovery API. 
The API is quite simple.  There are a few extra functions
on DisplayManager to scan, connect and disconnect from
wifi displays and get status, and a single protected
broadcast sent when the status changes.

Change-Id: Ic91dbab5ee818e790b27fa32e1a1e93788793be0
 2012-09-08 14:53:34 -07:00
Christopher Tate
4ea283a05f Merge "Sanity-check existence of restore agent" into jb-mr1-dev 2012-09-07 18:40:12 -07:00
Dianne Hackborn
5d75052b2d Merge "Add Binder.getCallingUserHandle()." into jb-mr1-dev 2012-09-07 18:35:02 -07:00
Dianne Hackborn
74ee8652e0 Add Binder.getCallingUserHandle(). 
Change-Id: I2a7eedfdc7baeeb4c2cd2ca0153aa95e0cf0bf45
 2012-09-07 18:33:18 -07:00
Christopher Tate
e7287a0791 Sanity-check existence of restore agent 
When a restore dataset includes data for an app that used to have
a backup agent, but does not in the currently-installed version, we
were merrily trying to bring up the agent for restore anyway, and
crashing.  Now we don't do that; we check whether there's actually
going to be an agent to handle the data before doing any of the
heavy work.

Bug 7130695

Change-Id: I0a38c2a8bb51d4a140a72d22896fa58d98ebaa02
 2012-09-07 18:32:12 -07:00
Dianne Hackborn
824b959dfc Merge "Explicitly specify current user everywhere home is started." into jb-mr1-dev 2012-09-07 18:01:23 -07:00
Jeff Brown
0cfebf28b1 Retry wifi display connections. 
Change-Id: I48c62c7e272c2696022ddeea1c3107d24a9431b8
 2012-09-07 17:50:58 -07:00
Jeff Brown
4d0b562554 Disable hardcoded wifi display adapter. 
Change-Id: Id0f7d59b6eafa8794ff7616cf54a0b94ba78c763
 2012-09-07 17:50:56 -07:00
Dianne Hackborn
d888399ad4 Explicitly specify current user everywhere home is started. 
Change-Id: I58d86136de7f9cef1eaf72793d0e200b852d7355
 2012-09-07 17:48:06 -07:00
Svetoslav Ganov
0458a69d4d Merge "Fixing off by one error in the ScreenMagnifier." into jb-mr1-dev 2012-09-07 17:34:01 -07:00
Svetoslav Ganov
2cee686498 Fixing off by one error in the ScreenMagnifier. 
Change-Id: Ia0ccfb6b354b7a18633e7cf26647c6436ebf5c08
 2012-09-07 17:33:09 -07:00
Geremy Condra
1d4e1204ca Add components for the Android Config Updater to system server. 
This adds the necessary bits to verify and install configuration
updates using system server. It also includes the cert pinning
updater as the first user.

Change-Id: I42307f58074157b33b6e01216aab10022340d449
 2012-09-07 16:50:11 -07:00
Jeff Brown
72018294cc Merge "Make mirroring automatic based on Windows on display." into jb-mr1-dev 2012-09-07 16:01:37 -07:00
Jeff Brown
7017e48380 Merge "Add support for Wifi display." into jb-mr1-dev 2012-09-07 16:00:13 -07:00
Nick Kralevich
cd620591b7 Merge "installd: fix forward locking symlink" into jb-mr1-dev 2012-09-07 15:58:44 -07:00
rich cannings
1275abd013 Merge "Move verification settings to Settings.Global" into jb-mr1-dev 2012-09-07 15:54:13 -07:00
Dianne Hackborn
cd42ce5d61 Merge "Fix crash when setting wallpaper from non-primary user." into jb-mr1-dev 2012-09-07 15:52:37 -07:00
Dianne Hackborn
11941fd651 Fix crash when setting wallpaper from non-primary user. 
When accessing a content provider, there is a check for whether
the provider can run in the caller's process; if so, even if the
provider is currently published, we return to the caller that it
can run locally.

This check was broken -- it had an old condition that allowed
content providers owned by the system UID to run in any other UID's
process.  This is wrong, since by definition the other
UIDs would not be able to access the data under the original UID.

We ran into this because the activity picker is part of the
android platform manifest, so runs as the system process.  However
it needs to run as the user who invoked it, so when coming from the
non-primary user we spin up a "system" process running as a uid of
that user.  Now when that process tries to access the settings
provider, the broken check would think that a new instance of the
settings provider should be created in the caller's process.

Change-Id: I7bf495ed8370cb271bdaec073d5b7dda9e38c546
 2012-09-07 15:50:26 -07:00
Nick Kralevich
7de350a913 installd: fix forward locking symlink 
installd was not creating a compatibility symlink when
installing a forward locked application.  Fix.

Bug: 7121527
Change-Id: Ied507ab2b759d8658af563e6ac8f0dbb0d286cce
 2012-09-07 15:48:11 -07:00