Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,542 Commits 3 Branches 0 Tags
2eba91d98f3456abc5899766daebbcddea1b9fcd
Commit Graph

8608 Commits

Author SHA1 Message Date
Philip Milne
2eba91d98f am b00df8e9: Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev 
* commit 'b00df8e929f9ba865a95a7df3f949e6169332954':
  Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()
 2012-09-24 11:05:19 -07:00
Philip Milne
b00df8e929 Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev 2012-09-24 11:02:31 -07:00
Dianne Hackborn
dae9f15389 am cd11b223: Merge "Fix issue #7214090: Need to be able to post notifications to all users" into jb-mr1-dev 
* commit 'cd11b223f3d23ca0f92b53808f7e1cce928c2a7b':
  Fix issue #7214090: Need to be able to post notifications to all users
 2012-09-24 11:00:57 -07:00
Dianne Hackborn
cd11b223f3 Merge "Fix issue #7214090: Need to be able to post notifications to all users" into jb-mr1-dev 2012-09-24 10:58:20 -07:00
Dianne Hackborn
50cdf7c306 Fix issue #7214090: Need to be able to post notifications to all users 
Also fix a bunch of system services that should be doing this.  And
while doing that, found I needed to fix PendingIntent to evaluate
USER_CURRENT at the point of sending, not creation.

Note that this may end up with us having some notification shown to
non-primary users that lead to settings UI that should only be for
the primary user (such as the vpn notification).  I'm not sure what
to do about this, maybe we need a different UI to come up there or
something, but showing the actual notification for those users at
least seems less broken than not telling them at all.

Change-Id: Iffc51e2d7c847e3d05064d292ab93937646a1ab7
 2012-09-24 10:55:46 -07:00
Amith Yamasani
bbad3f8d2f am 888eb73c: resolved conflicts for merge of 814f5ac3 to jb-mr1-dev 
* commit '888eb73c6e86a18520cbaa999a18e8b039dbed4f':
  Fixing services start order that impacts ICS - JB upgrade
 2012-09-24 09:40:49 -07:00
Amith Yamasani
888eb73c6e resolved conflicts for merge of 814f5ac3 to jb-mr1-dev 
Change-Id: Ic65395ce932971dc9c37a481aa96da79a45d0f12
 2012-09-24 09:26:37 -07:00
Victoria Lease
a06464b16d am 8658e1aa: Merge "Allow apps to getProviders() without location permissions." into jb-mr1-dev 
* commit '8658e1aa1fb0905852c4b0f5ae1d96cd2d56b6cf':
  Allow apps to getProviders() without location permissions.
 2012-09-24 09:05:04 -07:00
Victoria Lease
8658e1aa1f Merge "Allow apps to getProviders() without location permissions." into jb-mr1-dev 2012-09-24 09:02:13 -07:00
Jeff Sharkey
63001c679c am 49397ac9: Merge "Always bind to DefaultContainerService as OWNER." into jb-mr1-dev 
* commit '49397ac93ce3cf4fc38d00b1099a6cd9075cee8a':
  Always bind to DefaultContainerService as OWNER.
 2012-09-24 08:48:19 -07:00
Irfan Sheriff
c45d6362fd am 916b2b5a: Merge "Increase WFD connect time out to 60s" into jb-mr1-dev 
* commit '916b2b5a932a3be1a1363ac1871e74ad8b314f00':
  Increase WFD connect time out to 60s
 2012-09-24 08:48:10 -07:00
Victoria Lease
f5f6bd66be am 17e3e9e5: Merge "Do not use passive GPS data for COARSE only apps." into jb-mr1-dev 
* commit '17e3e9e53c5fb9c92c8972a8d92659c6bef85831':
  Do not use passive GPS data for COARSE only apps.
 2012-09-24 08:47:38 -07:00
Jeff Sharkey
7ba3dad8f0 am 5a370882: Merge "Check READ_EXTERNAL enforcement outside of lock." into jb-mr1-dev 
* commit '5a370882f87321629f98f6149ac946a57e25dfa8':
  Check READ_EXTERNAL enforcement outside of lock.
 2012-09-24 08:47:24 -07:00
Jeff Sharkey
e2bb66f64c am 11820f73: Merge "Allow acquiring ContentProviders across users." into jb-mr1-dev 
* commit '11820f7386ce86fd89e9e6b49d9231dce6e1ed07':
  Allow acquiring ContentProviders across users.
 2012-09-24 08:47:17 -07:00
Dianne Hackborn
66c86dd38b am b939e352: Merge "Fix issue #7209355, #7214271." into jb-mr1-dev 
* commit 'b939e35274334d1f5e71a526efe8d235eb6d7387':
  Fix issue #7209355, #7214271.
 2012-09-24 08:47:13 -07:00
Dianne Hackborn
bbb3bd9b7c am 88923c97: Merge "Fix issue #7214462: Some recent thumbnails are black." into jb-mr1-dev 
* commit '88923c973e3b58593c4d0fb6724addcefc53004f':
  Fix issue #7214462: Some recent thumbnails are black.
 2012-09-24 08:46:19 -07:00
Svetoslav Ganov
5acc556c26 am 9f12373b: Merge "Fixing a regression in the UI test automation." into jb-mr1-dev 
* commit '9f12373b57bcd7e7c156306aee50ac4e4fdee58a':
  Fixing a regression in the UI test automation.
 2012-09-24 08:46:15 -07:00
Adam Cohen
e886e6a423 am 993c3d79: Merge "Fixing typos" into jb-mr1-dev 
* commit '993c3d79a3f70684db5c75fb760bae9b0324f715':
  Fixing typos
 2012-09-24 08:46:12 -07:00
Amith Yamasani
018824cab0 am 77e95d3d: Merge "Show lockscreen widgets for the current user." into jb-mr1-dev 
* commit '77e95d3d71f10a0d936445e3f3ed90e15c019024':
  Show lockscreen widgets for the current user.
 2012-09-24 08:46:08 -07:00
Amith Yamasani
b079d1f280 am 5e8cbdc0: Merge "Fixing services start order that impacts ICS - JB upgrade" 
* commit '5e8cbdc0bd6dfc51e6b54db1d5fd61347336d862':
  Fixing services start order that impacts ICS - JB upgrade
 2012-09-24 08:45:14 -07:00
Jeff Sharkey
49397ac93c Merge "Always bind to DefaultContainerService as OWNER." into jb-mr1-dev 2012-09-23 18:25:47 -07:00
Irfan Sheriff
916b2b5a93 Merge "Increase WFD connect time out to 60s" into jb-mr1-dev 2012-09-23 17:32:07 -07:00
Irfan Sheriff
2c2ca5cb7c Increase WFD connect time out to 60s 
The worst case WPS timeout for GO negotiation is two minutes.
Until, we better handle cancelling/disconnecting and re-syncing the
WFD framework with the wifi direct framework/supplicant, increase
the time out to 60s to help with dogfood

Bug: 7217600
Change-Id: I1ba0d9963b957454e2c6f47bfdf05176dea07be7
 2012-09-23 17:30:19 -07:00
Jeff Sharkey
752cd922f7 Always bind to DefaultContainerService as OWNER. 
When PackageManagerService deals with external storage, always bind
to DefaultContainerService as USER_OWNER.  This avoids binding to a
stopped user, which would fail.

Bug: 7203111
Change-Id: I8e303c7558e8b5cbe4fea0acc9a472b598df0caa
 2012-09-23 16:44:34 -07:00
Victoria Lease
17e3e9e53c Merge "Do not use passive GPS data for COARSE only apps." into jb-mr1-dev 2012-09-23 15:06:59 -07:00
Victoria Lease
8dbb63419b Allow apps to getProviders() without location permissions. 
This restores MR0's behavior in this regard - apps calling
LocationManager.getProviders() or LocationManager.getBestProvider()
will no longer receive a SecurityException if they do not have
any location permissions. Instead, as was the behavior in MR0, they
only receive providers that their permissions grant them access to,
including an empty list if they have no permission whatsoever.

Bug: 7207864
Change-Id: I027df425e258d436c4821c34a25bc46a2a292824
 2012-09-23 14:09:47 -07:00
Jeff Sharkey
5a370882f8 Merge "Check READ_EXTERNAL enforcement outside of lock." into jb-mr1-dev 2012-09-23 13:23:39 -07:00
Jeff Sharkey
11820f7386 Merge "Allow acquiring ContentProviders across users." into jb-mr1-dev 2012-09-23 13:22:27 -07:00
Dianne Hackborn
b939e35274 Merge "Fix issue #7209355, #7214271." into jb-mr1-dev 2012-09-23 12:58:10 -07:00
Dianne Hackborn
8da429e80d Fix issue #7209355, #7214271. 
Issue #7209355: Intent on the secondary user results in an intent picker
in the Primary user.
Issue #7214271: Crash in system UI

Also fix a bug where I recently broke the removeTask() operation in the
activity manager where it would remove the wrong task.

Change-Id: I448c73a0e83a78d9d8d96b4629658c169888d275
 2012-09-23 12:53:34 -07:00
Jeff Sharkey
c50f31d213 Check READ_EXTERNAL enforcement outside of lock. 
Since SettingsProvider can call back into PMS, query the default
enforcement state before acquiring mPackages lock.

Bug: 7182437
Change-Id: Ie218aedfc7a943e5b221814af3e0356c7199b0e4
 2012-09-22 17:14:02 -07:00
Jeff Sharkey
6d51571835 Allow acquiring ContentProviders across users. 
Otherwise services like SystemUI will always open content://-style
Uris as USER_OWNER.  Surfaces through createPackageContextAsUser()
which points all ContentResolver operations towards a given user.

Start using in RemoteViews, so that Notifications correctly resolve
image Uris to the sending user.  Also add user support for "content"
shell tool.

Bug: 7202982
Change-Id: I8cb7fb8a812e825bb0b5833799dba87055ff8699
 2012-09-21 19:49:43 -07:00
Dianne Hackborn
88923c973e Merge "Fix issue #7214462: Some recent thumbnails are black." into jb-mr1-dev 2012-09-21 18:47:18 -07:00
Dianne Hackborn
6a864959e0 Fix issue #7214462: Some recent thumbnails are black. 
Change-Id: I9a2704c95a8701c9fb6755662fb47d4743099bf9
 2012-09-21 18:46:11 -07:00
Svetoslav Ganov
9f12373b57 Merge "Fixing a regression in the UI test automation." into jb-mr1-dev 2012-09-21 18:26:52 -07:00
Svetoslav Ganov
9371a0a0c0 Fixing a regression in the UI test automation. 
bug:6967373

Change-Id: I28f01a2bfe44febcb1a519028dab82fb1da9753e
 2012-09-21 18:20:42 -07:00
Adam Cohen
993c3d79a3 Merge "Fixing typos" into jb-mr1-dev 2012-09-21 18:19:06 -07:00
Amith Yamasani
77e95d3d71 Merge "Show lockscreen widgets for the current user." into jb-mr1-dev 2012-09-21 18:16:49 -07:00
Adam Cohen
db38d8a4ff Fixing typos 
Change-Id: I3d470a18bd14a4040dffb0b0d8a11e282546057e
 2012-09-21 18:14:58 -07:00
Amith Yamasani
8fd96ec2dc Show lockscreen widgets for the current user. 
Also shows the owner info and next alarm for the current user.
AppWidgetService now assumes that any widgets running in the system process are for the
current user, so that lockscreen shows widgets for the current user

Bug: 7211754
Bug: 7212421

Change-Id: Iaf0edc60e49af0afe42625c0b2dcf100c9ecc178
 2012-09-21 18:10:34 -07:00
Svetoslav Ganov
31a2b8c7bf am 0a5c5567: Merge "Multi-user support for the accessibility layer." into jb-mr1-dev 
* commit '0a5c5567f2d7e203d95c80a8d3353d0acd98b5f9':
  Multi-user support for the accessibility layer.
 2012-09-21 17:50:51 -07:00
Dianne Hackborn
f3d2608939 am c9e94ea6: Merge "Fix issue #7213113: Remove old intent resolver" into jb-mr1-dev 
* commit 'c9e94ea6451958fce107580b54c183181de6aa22':
  Fix issue #7213113: Remove old intent resolver
 2012-09-21 17:50:36 -07:00
Jeff Brown
919a4cdfe2 am 3ca59713: Merge "Support HDMI hotplug." into jb-mr1-dev 
* commit '3ca5971339c7eba61388aa3e26a1b3d02c5ccdf6':
  Support HDMI hotplug.
 2012-09-21 17:49:35 -07:00
Jim Miller
f084208bdf am 1ed9fa10: Merge "Make DPM API for disabling keyguard widgets more generic" into jb-mr1-dev 
* commit '1ed9fa10de3e94678ddb2929936caa3ff4164cf8':
  Make DPM API for disabling keyguard widgets more generic
 2012-09-21 17:49:00 -07:00
rich cannings
3b7f3cbfe8 am 04c2bb86: Merge "Add setting to skip verifying ADB installs" into jb-mr1-dev 
* commit '04c2bb86ca47378c99576c5ff7cb8283683dc935':
  Add setting to skip verifying ADB installs
 2012-09-21 17:48:17 -07:00
Craig Mautner
ddb8d072cd am 9921d842: Merge "Eliminate potential for NPE in WindowAnimator." into jb-mr1-dev 
* commit '9921d842bb2654fd354612f5637c8a248bdb299f':
  Eliminate potential for NPE in WindowAnimator.
 2012-09-21 17:47:14 -07:00
Amith Yamasani
38e69e96f4 am 74defbf2: Merge "Query users excluding any being removed" into jb-mr1-dev 
* commit '74defbf202de713aa6ae19fbbf2ea5c318ccd11c':
  Query users excluding any being removed
 2012-09-21 17:44:50 -07:00
Svetoslav Ganov
0a5c5567f2 Merge "Multi-user support for the accessibility layer." into jb-mr1-dev 2012-09-21 17:21:45 -07:00
Dianne Hackborn
c9e94ea645 Merge "Fix issue #7213113: Remove old intent resolver" into jb-mr1-dev 2012-09-21 17:05:47 -07:00
Dianne Hackborn
52c62344c5 Fix issue #7213113: Remove old intent resolver 
Also make the query package restart broadcast protected like the
documentation says it should be.

Change-Id: I445166111318a02f2f2b1ab0dff9c641a441c20b
 2012-09-21 17:04:16 -07:00