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

8678 Commits

Author SHA1 Message Date
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
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
f8f28e8735 am 97e7c59c: Merge "Enable package verification" into jb-mr1-dev 
* commit '97e7c59c5f669f4af8a77aee4646933108dfff48':
  Enable package verification
 2012-09-16 16:32:49 -07:00
rich cannings
97e7c59c5f Merge "Enable package verification" into jb-mr1-dev 2012-09-16 16:30:25 -07:00
Iliyan Malchev
6e7650719e am 86e85efe: Merge "Set backlight brightness in correct order." into jb-mr1-dev 
* commit '86e85efe9b10abb2dd60df7ab81db6fc71fdda34':
  Set backlight brightness in correct order.
 2012-09-16 16:29:08 -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
6b2fc4f865 am 3849490c: Merge "Return empty scan results for background user" into jb-mr1-dev 
* commit '3849490c6314d5887f534cc5dea0fc56499465aa':
  Return empty scan results for background user
 2012-09-16 15:26:08 -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
a5db12ae6d am a91f9e29: Make more items per-Display. 
* commit 'a91f9e2959ee905f97977a88fe45bde6ffb874b0':
  Make more items per-Display.
 2012-09-16 10:48:11 -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
addd270c5b am d65afc65: Merge "More multi-user stuff." into jb-mr1-dev 
* commit 'd65afc65ea5b2bf83889dd88a9c94f895da8aece':
  More multi-user stuff.
 2012-09-16 00:08:39 -07:00
Dianne Hackborn
d65afc65ea Merge "More multi-user stuff." into jb-mr1-dev 2012-09-16 00:05:46 -07:00
Dianne Hackborn
953005125c am 398bad04: Merge "Fix debug log." into jb-mr1-dev 
* commit '398bad04a0ced9dacda185db8af7526002631f62':
  Fix debug log.
 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