10763 Commits

Author SHA1 Message Date
Andy Stadler
ab3d0fd684 Merge "Move files to make eclipse-java happy" into jb-mr1-dev 2012-09-18 14:20:30 -07:00
Andy Stadler
d44daaba44 Move files to make eclipse-java happy
No changes to text at all, just moving the java files to match their
declared packages.

There was no original bug# but this cleans up the code submitted in
the original Change-Id: I42307f58074157b33b6e01216aab10022340d449

Change-Id: I233fa7f21167a42565aadb7ad109600b1a1a5721
2012-09-18 14:08:30 -07:00
Irfan Sheriff
104212aa7a am 24ed2769: Merge "WFD fixes" into jb-mr1-dev
* commit '24ed2769130a8f9df44e7fc22be52b6282e724c3':
  WFD fixes
2012-09-18 14:03:36 -07:00
Jeff Sharkey
27bd34d9d9 Multi-user MTP.
The current MTP kernel driver at /dev/mtp_usb is exclusive, meaning
only one process can have it open. In addition, each MTP session
with a desktop requires unique object IDs, which doesn't hold true
across users on the device.

To solve these two issues, when switching users we cycle the USB host
stack to disconnect both local and remote MTP connections, giving the
new user's media process a chance to claim /dev/mtp_usb, and causing
the desktop to initiate a new MTP session.

This change also allows BroadcastReceivers to registerReceiver()
allow retrieval of a current sticky broadcast. Adds a system property
to override maximum users. Removes MOUNTED broadcasts for secondary
users. Allows INTERACT_ACROSS_USERS to getCurrentUser().

Bug: 6925114
Change-Id: I02b4a1b535af95fb2142655887b6d15a8068d18a
2012-09-18 13:26:26 -07:00
Irfan Sheriff
24ed276913 Merge "WFD fixes" into jb-mr1-dev 2012-09-18 12:22:06 -07:00
Irfan Sheriff
e0c28d5f13 WFD fixes
- Specificy max GO intent for WFD
- Increase GO idle time out to 20s and use it for GO and client
- Fix connection broadcast

Change-Id: Ia0e28bc9eb3e23d2830a6c814c5a537ca0bcd5db
2012-09-18 12:20:37 -07:00
Amith Yamasani
7d43c417b6 am f7a6dfca: Merge "Pass Bitmap instead of ParcelFileDescriptor in UserManager" into jb-mr1-dev
* commit 'f7a6dfcafc1eaa8014b4fa796e4b31208f72fd36':
  Pass Bitmap instead of ParcelFileDescriptor in UserManager
2012-09-17 22:54:56 -07:00
Amith Yamasani
f7a6dfcafc Merge "Pass Bitmap instead of ParcelFileDescriptor in UserManager" into jb-mr1-dev 2012-09-17 22:53:21 -07:00
Amith Yamasani
e928d7d95d Pass Bitmap instead of ParcelFileDescriptor in UserManager
Add a USER_INFO_CHANGED intent for lockscreen and quicksettings to use
to monitor changes to the user name or icon.

Bug: 7164040
Change-Id: Id6fb8b6d38ce04ccd02bbadcf0c10699783d6c03
2012-09-17 21:46:51 -07:00
Geremy Condra
9b2c77621a Merge "DO NOT MERGE Added event logging for config installation failures." into jb-mr1-aah-dev 2012-09-17 20:09:56 -07:00
Dave Burke
43a104e54d am 049dd8e6: Merge "Revert "Specify max go intent for wifi display"" into jb-mr1-dev
* commit '049dd8e6a3815519062902cc6b6f91940c54d5ea':
  Revert "Specify max go intent for wifi display"
2012-09-17 19:02:28 -07:00
Dave Burke
049dd8e6a3 Merge "Revert "Specify max go intent for wifi display"" into jb-mr1-dev 2012-09-17 18:58:11 -07:00
Dianne Hackborn
b34b1d5ddd am c535d2f3: Merge "Fix dumb bug merging receivers for multiple users." into jb-mr1-dev
* commit 'c535d2f30efff83b93094bbc642d59d8225dcc18':
  Fix dumb bug merging receivers for multiple users.
2012-09-17 18:57:06 -07:00
Dave Burke
ee261a5a6c Revert "Specify max go intent for wifi display"
This reverts commit 7ab7260697de617aced0b0ba594304a42e5395bd

Change-Id: I5b322f41729695465b164e1dfe6d4b1902cd8117
2012-09-17 18:56:19 -07:00
Dianne Hackborn
c535d2f30e Merge "Fix dumb bug merging receivers for multiple users." into jb-mr1-dev 2012-09-17 18:52:30 -07:00
Dianne Hackborn
6cbd33fc25 Fix dumb bug merging receivers for multiple users.
Also clean up some debug output.

Change-Id: Ib19e47682e9ddfc6a234bd61d054275a362d28cc
2012-09-17 18:43:00 -07:00
Dianne Hackborn
d2011dcdc4 am c33f94e2: Merge "Fix API review bugs." into jb-mr1-dev
* commit 'c33f94e2a50c9b03cb771237e8672743da8b1314':
  Fix API review bugs.
2012-09-17 18:25:00 -07:00
Geremy Condra
6180dee0ed DO NOT MERGE Added event logging for config installation failures.
This just logs the directory the data is being written to, which
will tell us whether we've pushed a bad update and are about to
start wedging devices.

Change-Id: Iaaef6d41b2ab18bcce295c583ee13f49e337ed65

Conflicts:

	services/java/com/android/server/updatable/ConfigUpdateInstallReceiver.java
2012-09-17 18:24:36 -07:00
Dianne Hackborn
c33f94e2a5 Merge "Fix API review bugs." into jb-mr1-dev 2012-09-17 18:22:38 -07:00
Irfan Sheriff
efa2d9d46f am 218e2f19: Merge "Specify max go intent for wifi display" into jb-mr1-dev
* commit '218e2f199b9ba568a815d64269ea0784e2d32935':
  Specify max go intent for wifi display
2012-09-17 17:41:13 -07:00
Irfan Sheriff
218e2f199b Merge "Specify max go intent for wifi display" into jb-mr1-dev 2012-09-17 17:37:48 -07:00
Irfan Sheriff
7ab7260697 Specify max go intent for wifi display
For p2p and sta single channel concurrency, we need the device
to be a GO

Change-Id: I8c3f180b8fc450238e24dace478f03cdf4e370a7
2012-09-17 17:34:03 -07:00
Dianne Hackborn
8832c18d8b Fix API review bugs.
7173152 API REVIEW: android.content.pm.PackageUserState
7172969 API REVIEW: android.app.PendingIntent
7172730 API REVIEW: android.content.Context
7172726 API REVIEW: android.manifest.permission

Change-Id: Iad470256d3b5ca5596487f6a699ec1871457c3b5
2012-09-17 17:27:15 -07:00
Dianne Hackborn
131fa7fd55 am 4246f695: Merge "Try again to fix issue #6912004:tap on gmail notification sends me to home screen" into jb-mr1-dev
* commit '4246f695f44386ce74d94f5be73cde409dc2dd12':
  Try again to fix issue #6912004:tap on gmail notification sends me to home screen
2012-09-17 16:50:27 -07:00
Geremy Condra
cd7f13475c Merge commit 'c31f5a7e' into manualmerge
Conflicts:
	services/java/com/android/server/updatable/ConfigUpdateInstallReceiver.java

Change-Id: I40453434c04b2f41788b70e1d91f1777a8f7b120
2012-09-17 16:23:57 -07:00
Dianne Hackborn
4246f695f4 Merge "Try again to fix issue #6912004:tap on gmail notification sends me to home screen" into jb-mr1-dev 2012-09-17 16:19:14 -07:00
Geremy Condra
c31f5a7efe Merge "Add error information to event logs." into jb-mr1-dev 2012-09-17 16:07:46 -07:00
Geremy Condra
beb9d53971 Add error information to event logs.
Change-Id: Ie4bbb888f4fac4db42a60b9fdd6818af24b834bd
2012-09-17 16:06:17 -07:00
Dianne Hackborn
ad9b32115b Try again to fix issue #6912004:tap on gmail notification sends me to home screen
Add a new call to the activity manager to tell it when the activity
is resumed, so it can mark its state as dirty then instead of when
it first tries to create it.

Also tweak things to update the LRU list for the upcoming activity
at the point we start pausing the current activity, to avoid an
inefficiency where we may decide to kill the process of the upcoming
activity if it is at the end of the LRU list.

Change-Id: Ia6dc8c34dc6d4b085a1efbe3a5d5f47721d55078
2012-09-17 16:03:22 -07:00
Kenny Root
5acd08c197 am 4215017c: Merge "Use shared app gid for dalvik cache" into jb-mr1-dev
* commit '4215017c12a4d522e20a6164ff33e8ca7da3a3bd':
  Use shared app gid for dalvik cache
2012-09-17 15:32:21 -07:00
Kenny Root
4215017c12 Merge "Use shared app gid for dalvik cache" into jb-mr1-dev 2012-09-17 15:29:38 -07:00
Amith Yamasani
54052ba0c5 am 1d31d5ba: Merge "Start userId from 10, reserving 1-9 for special use in the future." into jb-mr1-dev
* commit '1d31d5ba129007fc13bd0ed49a3e3cd60e748e7c':
  Start userId from 10, reserving 1-9 for special use in the future.
2012-09-17 14:59:53 -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
Kenny Root
6a9b2cb7fe Use shared app gid for dalvik cache
For forward-locked apps, we need to be able to read the optimized dex
file from a common place. Make it owned by the shared app GID as well.

Bug: 7178231
Change-Id: Ib36d79e8df69d58e8e1e0f167659df995dc84b84
2012-09-17 14:02:39 -07:00
Jeff Brown
750963b467 am e2fb5190: Merge "Swap remote submix initialization order." into jb-mr1-dev
* commit 'e2fb51900cb6df51b2dffc80c35ecbbaf47d3f4b':
  Swap remote submix initialization order.
2012-09-17 13:35:21 -07:00
Jeff Brown
e2fb51900c Merge "Swap remote submix initialization order." into jb-mr1-dev 2012-09-17 13:32:41 -07:00
Amith Yamasani
ed29ca9c41 am e645324e: Merge "Add UserManager.getUserIcon()" into jb-mr1-dev
* commit 'e645324e6bb42075b2e3b37d776e180a51091f96':
  Add UserManager.getUserIcon()
2012-09-17 12:48:28 -07:00
Amith Yamasani
e645324e6b Merge "Add UserManager.getUserIcon()" into jb-mr1-dev 2012-09-17 12:46:01 -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
d202990510 am 178af594: Add debug to help with b/7135184.
* commit '178af5948d71c841278081c712506f7a7fca34b9':
  Add debug to help with b/7135184.
2012-09-17 11:36:44 -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
Irfan Sheriff
5e2f5fbccd am 89c82814: Merge "Add restoreCallingIdentity under finally" into jb-mr1-dev
* commit '89c82814dbdfd807b1611a8379be0421cd2f512d':
  Add restoreCallingIdentity under finally
2012-09-16 18:56:07 -07:00
Irfan Sheriff
89c82814db Merge "Add restoreCallingIdentity under finally" into jb-mr1-dev 2012-09-16 18:53:25 -07:00
Dianne Hackborn
eb1b5e2f1c am 443e4748: Merge "Fix issue #7175553: GRANT_URI_PERMISSION doesn\'t apper to work on secondary user" into jb-mr1-dev
* commit '443e474881e2b8d2fce0d23c54f8930742d8cdee':
  Fix issue #7175553: GRANT_URI_PERMISSION doesn't apper to work on secondary user
2012-09-16 18:13:33 -07:00
Irfan Sheriff
d2839e64ad am db831da4: Fix permission accessing getCurrentUser
* commit 'db831da426602f36e4ccf2eae64e999fcc52736a':
  Fix permission accessing getCurrentUser
2012-09-16 18:13:30 -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