16446 Commits

Author SHA1 Message Date
Robin Lee
0756e4e42e Merge "Fix privilege escalation for preferred activities" 2014-03-28 17:35:35 +00:00
Robin Lee
5c921daa72 Fix privilege escalation for preferred activities
Passing in the name of an actual admin should be enough to pass the
security check as it was. This is now fixed as the caller is not
given the opportunity to spoof its own name any more.

Change-Id: Id8be4ca4c8bf3751a1ee8125cf119fa100c81d22
2014-03-28 15:09:49 +00:00
John Spurlock
a4294297d4 Enhance the NotificationListenerService api.
Add to NotificationListenerService:
 - getActiveNotificationKeys() : String[]
 - getActiveNotifications(String[] keys) : StatusBarNotification[]
 - cancelNotifications(String[] keys) : void
 - onListenerConnected(String[] keys) : void

Add to StatusBarNotification:
 - getKey() : String

Bug:13562828
Change-Id: Idd9605dad8f942d68b4b32ab9625faf6c8642db9
2014-03-28 08:47:01 -04:00
Craig Mautner
a79501cd38 am af89d7e2: am bffd4d43: Merge "Check return values for null." into klp-modular-dev
* commit 'af89d7e21f5d7cbe74ff4ce014d8ab2db1a6fc27':
  Check return values for null.
2014-03-27 20:32:00 +00:00
Craig Mautner
af89d7e21f am bffd4d43: Merge "Check return values for null." into klp-modular-dev
* commit 'bffd4d437d133164877c6a194d6a533299072fae':
  Check return values for null.
2014-03-27 20:25:45 +00:00
Christopher Tate
450e63af4e Merge "Unlinked providers STILL shouldn't cause crashes" 2014-03-27 20:23:36 +00:00
Christopher Tate
132933dc2e Unlinked providers STILL shouldn't cause crashes
Bug 13651057

Change-Id: Id7e5ba521ac3f201b1a44f122358ca5af2929e06
2014-03-27 13:22:26 -07:00
Craig Mautner
bffd4d437d Merge "Check return values for null." into klp-modular-dev 2014-03-27 20:22:20 +00:00
Craig Mautner
9410f5983b am 723f7bbc: am 7f7ce0f7: am a2824410: Merge "Do not show Home behind full screen activity"
* commit '723f7bbcf34168b216421eee4b7d86199f90de1f':
  Do not show Home behind full screen activity
2014-03-27 20:20:49 +00:00
Craig Mautner
d3849f5415 Check return values for null.
When a Display has been removed there is a delay until all of its
windows have been removed. Therefore there is a possibility that
WindowState.getDisplayContent() returns null. Guard against that
possibility.

Fixes bug 13616765.

Change-Id: Ia2074d293b0e1bd4ca2cd14aeb4a2cc09ed9f41e
2014-03-27 13:19:29 -07:00
Craig Mautner
723f7bbcf3 am 7f7ce0f7: am a2824410: Merge "Do not show Home behind full screen activity"
* commit '7f7ce0f71b5f1b5274b0cda190401823508cda1f':
  Do not show Home behind full screen activity
2014-03-27 20:14:13 +00:00
Craig Mautner
a282441038 Merge "Do not show Home behind full screen activity" 2014-03-27 20:01:11 +00:00
Christopher Tate
f1977b4500 Expand install observer semantics
...and now fail conservatively when two apps both attempt to define
the same permission.  Apps signed with the same certificate are
permitted to redefine permissions.

We also finally have a (hidden) interface class for observing package
installation so that we can now rev the interface without breaking
existing callers.

Bug 13551375

Change-Id: Ifa4e59154dcccbb286ee46a35a6f25e4ad0f0f01
2014-03-27 12:37:47 -07:00
Adam Lesinski
350159c65a resolved conflicts for merge of 6984e4f9 to master
Conflicts:
	services/core/java/com/android/server/notification/NotificationManagerService.java

Change-Id: Ief1bf339cf7d75094c9a169264c015b1f286ed63
2014-03-27 18:26:11 +00:00
Adam Lesinski
6984e4f9bb am fc680b89: Merge "Fix a race in NotificationManager with Listeners" into klp-modular-dev
* commit 'fc680b89184fb60cf9a58e81d7f890002310702d':
  Fix a race in NotificationManager with Listeners
2014-03-27 17:18:03 +00:00
Narayan Kamath
ecd072161e resolved conflicts for merge of 22d07464 to master
Change-Id: Ic037261eedd6e224938c960d2b4597590c81ed9d
2014-03-27 14:22:47 +00:00
Narayan Kamath
22d074643e resolved conflicts for merge of eaab4df0 to klp-modular-dev-plus-aosp
Change-Id: I871431e5a3ce45a33563ced845e044d37471689b
2014-03-27 12:50:58 +00:00
Ashok Bhat
f5df700e6c AArch64: Make frameworks/base code more portable
Changes in this patch include

[x] Use %zu for size_t, %zd for ssize_t

[x] Some minor changes have been done to conform with
    standard JNI practice (e.g. use of jint instead of int
    in JNI function prototypes)

Change-Id: Id1aaa7894a7d0b85ac7ecd7b2bfd8cc40374261f
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
2014-03-27 12:30:42 +00:00
Yevgen Pronenko
0fd4c656d0 Do not show Home behind full screen activity
When ensureActivitiesVisibleLocked goes through foreground activity
stack and reaches non-fullscreen activity, it sets showHomeBehindStack
variable to true.

If there is a fullscreen activity behind, showHomeBehindStack remains
unchanged, which causes Home application to be displayed anyway.
In this case user will see a fullscreen activity and Home activity
simultaneously.

To fix the issue we set showHomeBehindStack to false when we reach
fullscreen activity in the activity stack.

This was made visible by the following commit:
446ef1de8d373c1b017df8d19ebf9a47811fb402

Change-Id: I535c1283a4e26f5cf606375b837d4b7195324af0
2014-03-27 07:54:37 +01:00
Adam Lesinski
e824026554 Fix a race in NotificationManager with Listeners
After being bound to, a NotificationListenerService could
make a call into NotificationManagerService before having been
added to the list of active services.

Bug: 13644375
Change-Id: I4ed920d165f46d009f91e28ca13c3926563cd110
2014-03-26 17:52:54 -07:00
Paul Lawrence
6ee7d25010 Revert "Don't prompt at boot if we already did that when decrypting"
This reverts commit 493e3e7e6523fd94cc1acae3e45935a1227d58c3.

Should fixes

Bug: 13611885
Bug: 13656830
Change-Id: I117c988bb6679f44f8add4fcc18f45cb8238dfb4
2014-03-26 22:31:04 +00:00
Christopher Tate
95ead2c589 Don't crash when handling unlinked widget bindings
A host can have an 'instance' the other end of which is still
unlinked to a concrete provider.  Don't crash when we hit those.

Bug 13651057

Change-Id: I5a29afb0e6a7ab30976862aee04bd33f609543fa
2014-03-26 14:42:56 -07:00
Glenn Kasten
1ee4eb074c Merge "Revert "Expand install observer semantics"" 2014-03-26 20:00:11 +00:00
Glenn Kasten
7629a18a3f Revert "Expand install observer semantics"
This reverts commit ab8a501f255b272af887acb0e66eb71cdf24c755.

Change-Id: I4ab4ae1a96efa2adf9d5a513793d8b84eef38b4e
2014-03-26 19:59:48 +00:00
Christopher Tate
9067dc03ff Merge "Expand install observer semantics" 2014-03-26 19:24:09 +00:00
John Spurlock
eeb397b77f Zen mode updates.
- Now only two modes, no more ZEN_MODE_FULL.
 - Alarms are allowed by default.
 - Interstitial dialog cleanup to follow current UX.

Change-Id: I8e4c8f64854dabfef69ad33b3eb35bee07e55ef7
2014-03-26 13:41:54 -04:00
Nick Kralevich
c76275377c am 32cc40a9: am fdd63510: am 491eaf22: Merge "Note libselinux dependency on packages.list format changes."
* commit '32cc40a9b57750451a6489e01526dc6a14d72bff':
  Note libselinux dependency on packages.list format changes.
2014-03-26 16:36:33 +00:00
Nick Kralevich
32cc40a9b5 am fdd63510: am 491eaf22: Merge "Note libselinux dependency on packages.list format changes."
* commit 'fdd6351067740f80148ff03c43d2ebc91f1d9656':
  Note libselinux dependency on packages.list format changes.
2014-03-26 15:55:41 +00:00
Stephen Smalley
e6e25554d3 Note libselinux dependency on packages.list format changes.
Change-Id: I3c34a86f5706c4fca826a8634936131e4e4fc297
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-03-26 09:19:12 -04:00
Christopher Tate
ab8a501f25 Expand install observer semantics
...and now fail conservatively when two apps both attempt to define
the same permission.

We also finally have a (hidden) interface class for observing package
installation so that we can now rev the interface without breaking
existing callers.

Bug 13551375

Change-Id: I3a286d024a30e812ee4b098f345401df3c00e178
2014-03-25 19:28:54 -07:00
Dan Sandler
59f0258a27 Categorize some system notifications.
Change-Id: Ia343bc276f50f488e2165056cff249a02f01d45a
2014-03-26 01:31:04 +00:00
Svetoslav
8a2b46d535 Merge "Wrong constant used for undefined accessibility window id." 2014-03-26 00:28:27 +00:00
Svetoslav
cbcc9695f0 Wrong constant used for undefined accessibility window id.
Change-Id: I8b14db034a42a7ffd211a46fa3fee7bf2a6eac8f
2014-03-25 17:27:37 -07:00
Craig Mautner
16744ac3f7 am d1e32cd3: Merge "Defer removal of activity until animation complete." into klp-modular-dev
* commit 'd1e32cd3207215e8bb63f18c6a5a4880b5344ef8':
  Defer removal of activity until animation complete.
2014-03-26 00:26:03 +00:00
Craig Mautner
79e6578b6c Defer removal of activity until animation complete.
Do not remove an AppWindowToken or its Task if it is running an
animation. Doing so leaves windows orphaned and bad things happen
when the system tries to retrieve the task assoicated with the
windows during layout.

Fixes the ugly output associated with bug 13440426.

Change-Id: I9d5fc50a7cb6189160d51cee3c82f7813baee715
2014-03-25 16:48:47 -07:00
Adam Lesinski
2471abec78 am e77786d5: am 99d60784: am 415e6f8e: Merge "Fix issue with early service start" into klp-modular-dev
* commit 'e77786d51f574ca7bbb45df136f92fc7c7d06ffe':
  Fix issue with early service start
2014-03-25 21:21:21 +00:00
Craig Mautner
d7bf82d6a4 am f32b22e9: resolved conflicts for merge of ca903d38 to klp-modular-dev
* commit 'f32b22e9c78cbc0109adbad67e9ff3d7045bd954':
  Move task to top in window manager.
2014-03-25 18:14:15 +00:00
Craig Mautner
f32b22e9c7 resolved conflicts for merge of ca903d38 to klp-modular-dev
Change-Id: I44b8cbeb9ae9f6e5c8b2fe1363127d6eccfdf041
2014-03-25 11:05:08 -07:00
Adam Lesinski
99d607844d am 415e6f8e: Merge "Fix issue with early service start" into klp-modular-dev
* commit '415e6f8ed46a70e6ae50e05cda56356dae31718c':
  Fix issue with early service start
2014-03-25 17:26:05 +00:00
Adam Lesinski
415e6f8ed4 Merge "Fix issue with early service start" into klp-modular-dev 2014-03-25 17:22:11 +00:00
Craig Mautner
81e094d76b Merge "Move task to top in window manager." into klp-dev 2014-03-25 16:48:38 +00:00
Matthew Williams
4bcf922a55 am c798e4f5: am 4701b51a: am bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule.
* commit 'c798e4f5497c39a3c6c14b120cffdee1122a9212':
  DO NOT MERGE: Downgrade expedited to normal on reschedule.
2014-03-25 10:04:56 +00:00
Matthew Williams
c798e4f549 am 4701b51a: am bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule.
* commit '4701b51af216ce2b6fa9fa508ebba47bf13063c7':
  DO NOT MERGE: Downgrade expedited to normal on reschedule.
2014-03-25 09:57:36 +00:00
Koji Fukui
39f7068ed9 Don't wait for finishing animation when second display is disconnected
Basically WindowManagerService wait for finishing animation when
a window is removed. But when second display is disconnected, windows
on second display can't be shown even if animation is waited for.
On the contrary, it keeps on waiting for finishing the animation
in special case.

With this fix windows are immediately removed without waiting for
animation when second display is disconnected.

Change-Id: I1354c193c04db394a21a11c174e10c8e7da17a0e
2014-03-25 11:25:32 +09:00
Matthew Williams
bb87ac7f97 DO NOT MERGE: Downgrade expedited to normal on reschedule.
bug: 12033540
Expedited was previously tracked by a redundant internal variable, ostensibly
as an optimisation. This variable could differ from the value in the bundle
depending on how the operation is initialised, which led to confusion. Now an
expedited sync will only be treated as such on its first execution.

Change-Id: Ibfc4e9e49b86c82f2364a6ef55f887705a053eb6
2014-03-24 14:42:06 -07:00
Craig Mautner
452fd49369 am 5332706b: am b98ee1eb: am 103ed355: am 557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown."
* commit '5332706b87c8772b97198e30c7cb4cc4ef3b577f':
  Set ScreenshotSurface secure if any secure content is shown.
2014-03-24 21:25:37 +00:00
Jinsuk Kim
1c855178e4 am 775a097f: am 3c34e5db: am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev
* commit '775a097f01a349548d2124ae9d7dd562c72eaa27':
  Add HdmiCecManager
2014-03-24 21:25:21 +00:00
Dianne Hackborn
43111e897b Merge "Battery stats: wake locks, radio active, cleanup." 2014-03-24 20:42:31 +00:00
Dianne Hackborn
4590e52f3d Battery stats: wake locks, radio active, cleanup.
- Improve wake lock work source updates to also update the current
  history tag, in case the new work source gets recorded in the
  history.

- Fix bug in recording radio active time that was not distributing
  any time to apps.

- No longer hold a wake lock while dispatching data conn active call,
  since it comes with its own timestamp.

- Fix issue where the top app was not being cleared while the screen
  was off.

- Remove obsolete STATS_LAST stats type.

- Fix bug that was not clearing the total run time when resetting
  the stats.

Change-Id: Iabe17a9edf34f762374ae09fcffb8a819cf72e30
2014-03-24 13:36:46 -07:00
Adam Lesinski
a6db4ab619 Fix issue with early service start
NotificationListener services would start too early
and crash due to system_server not being ready.

Bug: 13439345
Change-Id: I86ee93b50d016bfa0119e21a8cde8635212b16a4
2014-03-24 12:39:47 -07:00