Commit Graph

7986 Commits

Author SHA1 Message Date
John Spurlock
2b53b80ee7 am 9a67ad9f: am 7c46e438: Merge "Fix the dock-insertion Dream entry codepath." into jb-mr1-dev
* commit '9a67ad9f4cdbf3afe3df9af04b51090e6f849ca5':
  Fix the dock-insertion Dream entry codepath.
2012-08-09 08:21:48 -07:00
Daniel Sandler
015b9f45d4 Fix the dock-insertion Dream entry codepath.
Bug: 6956040
Change-Id: I663e13f8a28db13b94d0f5aa4dbcf0cd64ef22fe
2012-08-09 11:11:33 -04:00
Amith Yamasani
7f0e543de3 am 4fe1082e: am 8264408f: Start the correct settings from the status bar.
* commit '4fe1082ec60359baef1ccac2b3a74834fe862303':
  Start the correct settings from the status bar.
2012-08-08 16:57:19 -07:00
Amith Yamasani
8264408f59 Start the correct settings from the status bar.
Added a new method to Context: startActivityAsUser() requiring the
INTERACT_ACROSS_USERS_FULL permission.

Show the correct Recents list, based on current user.
Added a getRecentTasksForUser() in ActivityManager. Hidden and requires
the INTERACT_ACROSS_USERS_FULL permission.

Change-Id: If5b56465efdd3ead36601a3b51ed4af157bbf35c
2012-08-08 16:52:53 -07:00
Jeff Sharkey
57b7105835 resolved conflicts for merge of ab4e251a to master
Change-Id: I59ad9fe6e777c6677331f83d5e1de28b66f28af7
2012-08-08 16:39:00 -07:00
Jeff Sharkey
fb11ffa2a0 Merge "Isolate NetworkStateTracker creation, test." into jb-mr1-dev 2012-08-08 16:25:41 -07:00
Jeff Sharkey
e7f15b2286 am 6c73eb8a: am 82f479d0: Merge "Cleaner controls between Vpn and init services." into jb-mr1-dev
* commit '6c73eb8a73449ff87964936a1cc3e2d463fa7fab':
  Cleaner controls between Vpn and init services.
2012-08-08 16:25:34 -07:00
Jeff Sharkey
fb878b66b9 Isolate NetworkStateTracker creation, test.
Change ConnectivityService to use a factory when creating
NetworkStateTrackers, which gives us a good place to inject mocks
for testing.  Add initial tests to verify that network routes are
added and removed as networks changed.

Change-Id: I11cbc61a84c2ed4afa2670036295b1494eab26e1
2012-08-08 16:23:41 -07:00
Jeff Sharkey
82f479d064 Merge "Cleaner controls between Vpn and init services." into jb-mr1-dev 2012-08-08 16:22:23 -07:00
Rich Cannings
b38cb4da4a am 22c5c52d: am a56d9cec: Merge "Revert "Pass URLs to package verifiers"" into jb-mr1-dev
* commit '22c5c52d43d055db307e6a0136180e7995db49f1':
  Revert "Pass URLs to package verifiers"
2012-08-08 15:11:15 -07:00
Jason Simmons
6db52cd09f am b2977a45: am 5017f232: Call systemReady on the lock settings before doing so on the window manager
* commit 'b2977a45f62906cbb1b78c3c236ecdc9483753f7':
  Call systemReady on the lock settings before doing so on the window manager
2012-08-08 15:11:02 -07:00
Rich Cannings
a56d9cecee Merge "Revert "Pass URLs to package verifiers"" into jb-mr1-dev 2012-08-08 13:50:56 -07:00
Jason Simmons
5017f23284 Call systemReady on the lock settings before doing so on the window manager
At systemReady time, the window manager needs to obtain values from the lock
settings service (e.g. whether the lock screen is disabled).  During the
initial boot of a wiped device, the window manager was getting the wrong
values because LockSettingsService.systemReady/migrateOldData had not yet been
called.

Change-Id: I60825d0e4fad53a5b4349dabf9e5e299b863d0d0

(cherry pick of 2458abaf6676d5015af733c1010ecd67a085e9e2 from jb-aah-dev)
2012-08-08 13:15:00 -07:00
Rich Cannings
e1d7c711df Revert "Pass URLs to package verifiers"
This reverts commit 24713907fe

Change-Id: Ie04ba73475b813635c4a74915c45e83250801b6b
2012-08-08 12:46:06 -07:00
Dianne Hackborn
128f16cfe0 am 852f06b3: am 53791582: Merge "More mult-user API work." into jb-mr1-dev
* commit '852f06b3fc84d559c2ff2ede2b8477bfd4c4ffa6':
  More mult-user API work.
2012-08-08 10:27:38 -07:00
Dianne Hackborn
537915828b Merge "More mult-user API work." into jb-mr1-dev 2012-08-08 10:22:49 -07:00
John Spurlock
6d02584f70 am 62293d8d: am ec0feefd: Merge "Check the ACTIVATE_ON_DOCK setting in DockObserver." into jb-mr1-dev
* commit '62293d8dd6c28688f308f46dc2128f1780213fe0':
  Check the ACTIVATE_ON_DOCK setting in DockObserver.
2012-08-08 08:52:34 -07:00
John Spurlock
786546eacc Check the ACTIVATE_ON_DOCK setting in DockObserver.
Otherwise docking the device will always launch a Dream.

Change-Id: I2e74ca62f80d7e386d11c00920a75a5a6e78926c
2012-08-08 11:40:20 -04:00
Dianne Hackborn
7d19e0242f More mult-user API work.
- You can now use android:singleUser with receivers and providers.
- New API to send ordered broadcasts as a user.
- New Process.myUserHandle() API.

For now I am trying out "user handle" as the name for the numbers
representing users.

Change-Id: I754c713ab172494bb4251bc7a37a17324a2e235e
2012-08-07 19:19:22 -07:00
Svetoslav Ganov
071efcac33 am 53efd9da: am 85b1041f: Merge "Window position not reported if the window is not moved." into jb-mr1-dev
* commit '53efd9dac8b85e0dff484293c15d802655fd9d1c':
  Window position not reported if the window is not moved.
2012-08-06 23:56:33 -07:00
Svetoslav Ganov
85b1041f89 Merge "Window position not reported if the window is not moved." into jb-mr1-dev 2012-08-06 23:51:36 -07:00
Svetoslav Ganov
758143ecfe Window position not reported if the window is not moved.
1.If a window is shown but never moved the window window
  is never notified for its current location. Therefore,
  accessibility nodes do not contain correct bounds in
  screen coordinates.

bug:6926295

Change-Id: I7df18b095d33ecafffced75aba9e4f4693b0c393
2012-08-06 23:49:38 -07:00
Dianne Hackborn
99e3bba5ea am 7114b870: am 3c91724e: Merge "Refactor Service code out of main ActivityManagerService class." into jb-mr1-dev
* commit '7114b870f418448c6aa61e8d7a54228fe7f3dcbe':
  Refactor Service code out of main ActivityManagerService class.
2012-08-06 17:57:31 -07:00
Dianne Hackborn
3c91724e7a Merge "Refactor Service code out of main ActivityManagerService class." into jb-mr1-dev 2012-08-06 17:53:18 -07:00
Dianne Hackborn
599db5c85f Refactor Service code out of main ActivityManagerService class.
Change-Id: I83ade73b48e8fda1ad413634c1eb0dba2a545ca7
2012-08-06 17:52:02 -07:00
Ashish Sharma
47925232ec Merge "Setup idletimer for network interface." 2012-08-06 16:22:04 -07:00
Jeff Sharkey
088f29f55e Cleaner controls between Vpn and init services.
Change-Id: I35edf054f4a1190f7fb7b4c48ee832e899c9528b
2012-08-06 14:48:49 -07:00
Haoyu Bai
f71ca8a572 Setup idletimer for network interface.
Change-Id: I1251b60f4c3c31c75c2acd531495ca75bbb35ff5
2012-08-06 14:27:55 -07:00
Jeff Sharkey
4e4306ab14 Merge "Include network type that caused broadcast." into jb-mr1-dev 2012-08-06 13:40:44 -07:00
Jeff Sharkey
75fbb4bdfd Include network type that caused broadcast.
Network type can be obtained through EXTRA_NETWORK_INFO, but offer
it as first-class extra since the returned NetworkInfo is deprecated.

Bug: 6936247
Change-Id: Ief59577afd2bd930f0f4c5650b413feef86bfbc3
2012-08-06 11:45:01 -07:00
Jeff Sharkey
bec1d13da2 Merge "Make generic BaseNetworkObserver." into jb-mr1-dev 2012-08-05 14:58:13 -07:00
Jeff Sharkey
9c5c659597 Merge "Make LocalSocket Closeable." into jb-mr1-dev 2012-08-05 14:55:28 -07:00
Jeff Sharkey
216c181e76 Make generic BaseNetworkObserver.
This makes it easier to add new INetworkManagementEventObserver events
in future.

Change-Id: I432263d745558de4b878f313c1951230ed9db2b1
2012-08-05 14:32:41 -07:00
Jeff Sharkey
065b299df4 Make LocalSocket Closeable.
Enables usage of IoUtils.closeQuietly().

Change-Id: I91126297c1f235ae9da09f82d8f4f22db46558eb
2012-08-05 14:21:07 -07:00
Dianne Hackborn
2e5746a7a8 Merge "We can now (kind-of) change screen density on the fly." into jb-mr1-dev 2012-08-03 17:45:52 -07:00
Dianne Hackborn
dde331cebd We can now (kind-of) change screen density on the fly.
Preloaded drawables now have a density associated with them, so we
can load the correct drawable if we are using a different density.

Window manager now formally keeps track of the density for each
screen, allowing it to be overridden like you can already do with
size, and relies on this density to drive itself internally and
the configurations it reports.

There are a new set of Bitmap constructors where you provide a
DisplayMetrics so they can be constructed with the correct density.
(This will be for when you can have different windows in the same
app running at different densities.)

ActivityThread now watches for density changes, and pushes them
to the DENSITY_DEVICE and Bitmap global density values for that
process.

A new am command allows you to change the density.
2012-08-03 17:27:29 -07:00
Jeff Sharkey
0b24b1d37a Merge "Pass changed NetworkInfo to LocationProvider." into jb-mr1-dev 2012-08-03 11:56:03 -07:00
Jeff Sharkey
821bd8081a Pass changed NetworkInfo to LocationProvider.
LocationProviders often rely on non-default networks, so pass the
network that actually changed, instead of the default.

Bug: 6929692
Change-Id: I31d9eec792e07259282aa1bb57ec66c01962df64
2012-08-03 11:53:01 -07:00
John Spurlock
3185b376b0 Merge "Re-enable dreams: frameworks/base" into jb-mr1-dev 2012-08-03 08:36:41 -07:00
Craig Mautner
7de53949bc Merge "Add features to DisplayManager." into jb-mr1-dev 2012-08-03 08:25:42 -07:00
John Spurlock
bc632a28e4 Re-enable dreams: frameworks/base
Enable feature in config. Expose Dream in public api for unbundled apps.
Unhide package.  Add isDreaming() method to service.

Re-arrange the Dream api a bit.  (use onStart as hook for subclasses).
Coordinate properly with power manager.

Replace old dock mode (don't fire old intent).

Change-Id: I1318d20cc1613e5d862f2913f2fcdc9719302cf7
Bug: 6921930
2012-08-03 08:51:17 -04:00
Dianne Hackborn
329465c6b2 Merge "Add APIs for interacting across users." into jb-mr1-dev 2012-08-02 19:14:39 -07:00
Dianne Hackborn
b4163a6e12 Add APIs for interacting across users.
- Expose the existing Context.sendBroadcast() as
  Context.sendBroadcastAsUser().
- Add new android:singleUser attribute for services.
- Add new INTERACT_ACROSS_USERS_FULL permission for full
  system-level access to cross-user interface (allows
  sendBroadcastAsUser() to send to any receiver).
- Add new INTERACT_ACROSS_USERS_FULL permission for
  more restricted cross-user interaction: this is required
  for android:singleUser, and allows you to use
  sendBroadcastAsUser() but only to send to your own
  receivers.

Change-Id: I0de88f6718e9505f4de72e3f45d29c0f503b76e9
2012-08-02 19:07:57 -07:00
Jeff Brown
f95f3ebf12 Merge "Allow access to display manager service from isolated processes." into jb-mr1-dev 2012-08-02 14:58:47 -07:00
Jeff Brown
e7c1d88fba Allow access to display manager service from isolated processes.
Bug: 6921302
Change-Id: I9eed4a24992538e18ad0540b96a8cea2c8a9ef76
2012-08-02 14:55:26 -07:00
Craig Mautner
9de4936c99 Add features to DisplayManager.
Added Surface.setDisplayId().
Added callbacks to DisplayManagerService.

Change-Id: Idd3f85f8ca1f1208962f1196efd6a3ab51c8c259
2012-08-02 14:30:30 -07:00
Craig Mautner
2a642a450a Merge "Refactor DisplayManagerService to be functional." into jb-mr1-dev 2012-08-02 13:16:13 -07:00
rich cannings
24713907fe Pass URLs to package verifiers
This change passes the originating URL and accompanied referrer to
package verifiers, when available.

Bug: 6544677
Change-Id: If9ff6663ad7f3426b7aea2aceb1413b689788138
2012-08-02 11:26:47 -07:00
Craig Mautner
4f67ba6ba4 Refactor DisplayManagerService to be functional.
Change-Id: Ieac1eca172be5dc5db45302d3afa26188acd4d6d
2012-08-02 11:23:00 -07:00
Craig Mautner
437a0fbd57 Merge "Introduce multiple displays with DisplayContent." into jb-mr1-dev 2012-08-02 09:20:14 -07:00