103255 Commits

Author SHA1 Message Date
Ben Gruver
0b909eb6bf am 89454f83: Merge "Implement event logging for intent firewall" into jb-mr2-dev
* commit '89454f8331cd7d582eafca87c6586feb5db509c7':
  Implement event logging for intent firewall
2013-04-08 14:44:46 -07:00
Ben Gruver
0929c3b140 am b1a90d3b: Merge "Remove the sender package filter from the intent firewall" into jb-mr2-dev
* commit 'b1a90d3b1422b0eb469e8960e6398a49ec036e0b':
  Remove the sender package filter from the intent firewall
2013-04-08 14:41:06 -07:00
Ben Gruver
89454f8331 Merge "Implement event logging for intent firewall" into jb-mr2-dev 2013-04-08 21:40:26 +00:00
Ben Gruver
b1a90d3b14 Merge "Remove the sender package filter from the intent firewall" into jb-mr2-dev 2013-04-08 21:36:37 +00:00
Yorke Lee
855841cce4 am cf837a6e: Merge "Update DataUsageStatColumns" into jb-mr2-dev
* commit 'cf837a6e9034f0af3e58216578a1dad4cb635602':
  Update DataUsageStatColumns
2013-04-08 14:25:39 -07:00
Yorke Lee
cf837a6e90 Merge "Update DataUsageStatColumns" into jb-mr2-dev 2013-04-08 21:22:06 +00:00
The Android Open Source Project
227bbe1a9e Reconcile with jb-mr2-release - do not merge
Change-Id: I5031bf39aad4c57563c24a17a12c9c33ab259a32
2013-04-08 13:35:55 -07:00
Wink Saville
d6d7bc96e6 am 9e176c8b: Merge "Fix SignalStrength response." into jb-mr2-dev
* commit '9e176c8b0e0770598469f4580e54ab1e47a06fe8':
  Fix SignalStrength response.
2013-04-08 13:30:01 -07:00
Wink Saville
9e176c8b0e Merge "Fix SignalStrength response." into jb-mr2-dev 2013-04-08 20:26:02 +00:00
Dianne Hackborn
3793b92816 am bc948101: Merge "Have audio service clean up new receivers in crashing processes." into jb-mr2-dev
* commit 'bc948101043b3c4b57eb6e0e2421494fd7c1d41e':
  Have audio service clean up new receivers in crashing processes.
2013-04-08 13:20:02 -07:00
Nick Kralevich
c2fba0750d am 8e181c56: Merge "AppSecurityPermissions: minor UI changes" into jb-mr2-dev
* commit '8e181c56b3abc4e57f178849a8b6cef750913d5a':
  AppSecurityPermissions: minor UI changes
2013-04-08 13:13:06 -07:00
Dianne Hackborn
bc94810104 Merge "Have audio service clean up new receivers in crashing processes." into jb-mr2-dev 2013-04-08 20:10:37 +00:00
John Spurlock
fc9b371e90 am 04c83357: Merge "Awaken dreams on home + recents." into jb-mr2-dev
* commit '04c83357c3dee87f08e63a11e67e89d78df81938':
  Awaken dreams on home + recents.
2013-04-08 13:09:35 -07:00
Nick Kralevich
8e181c56b3 Merge "AppSecurityPermissions: minor UI changes" into jb-mr2-dev 2013-04-08 20:08:59 +00:00
Dianne Hackborn
79f7ec70eb Have audio service clean up new receivers in crashing processes.
The new media button receiver with only a pending intent (no
component name) could be left hanging if the process that
registered it went away.  These semantically need to be tied
to the calling process's lifetime; we now clean them up when
the calling process goes away.

Also added some additional cleanup of media button receivers
when packages change (updated, cleared).

And on top of that, a new "media" command for doing media
things.  Currently lets you send media keys and monitor
remote display data.

Oh and finally added a new BaseCommand base class for
implementing these command line utilities.

Change-Id: Iba1d56f10bab1eec4a94a7bb1d1c2ae614c8bcf5
2013-04-08 13:08:37 -07:00
John Spurlock
04c83357c3 Merge "Awaken dreams on home + recents." into jb-mr2-dev 2013-04-08 20:05:50 +00:00
ztenghui
8bfa40aea7 am 7ce7b006: Merge "HTML5Audio should handle content URI" into jb-mr2-dev
* commit '7ce7b0068c869408003f512a4e04cc73be2f7c69':
  HTML5Audio should handle content URI
2013-04-08 13:00:35 -07:00
Romain Guy
0899f11db1 am dcaa9436: Merge "Always take padding and margins into account Bug #8565842" into jb-mr2-dev
* commit 'dcaa9436fe8d5f4baeea5a09106cdf8a445d9a9b':
  Always take padding and margins into account Bug #8565842
2013-04-08 13:00:33 -07:00
ztenghui
7ce7b0068c Merge "HTML5Audio should handle content URI" into jb-mr2-dev 2013-04-08 19:58:22 +00:00
Romain Guy
dcaa9436fe Merge "Always take padding and margins into account Bug #8565842" into jb-mr2-dev 2013-04-08 19:57:04 +00:00
Romain Guy
76d59a3b7b Always take padding and margins into account
Bug #8565842

Change-Id: I8ee398b5c36b3011950265eb7e22cc8338f1aeee
2013-04-08 12:56:15 -07:00
Daniel Sandler
684d24cf66 am dc634351: Merge "Clean up language in forced foreground service notifications." into jb-mr2-dev
* commit 'dc634351d4f8a59e4b5743c58571d1ef04da668a':
  Clean up language in forced foreground service notifications.
2013-04-08 12:51:33 -07:00
Daniel Sandler
dc634351d4 Merge "Clean up language in forced foreground service notifications." into jb-mr2-dev 2013-04-08 19:46:02 +00:00
John Spurlock
c8b46ca575 Awaken dreams on home + recents.
Fixes the KEYCODE_HOME case, awakes when home is
started for any reason.

Also awaken when toggling recents (and not locked).

Bug:8557212
Change-Id: I6578ae3971740a03c27596b838d27a5ab9b03752
2013-04-08 19:18:59 +00:00
ztenghui
4233ec728d HTML5Audio should handle content URI
Change-Id: Ib7ef4ad5fdd5b6b051ae32b0968a9bddef5c65ba
2013-04-08 11:42:53 -07:00
Wink Saville
efbca4d01d Fix SignalStrength response.
Add makeSignalStrengthFromRilParcel for use by
RIL responseRilSignalStrength.

Bug: 8561333
Change-Id: Ie6eb3b0335e8d7ea114ec70b3fb72e917094632e
2013-04-08 11:35:47 -07:00
ztenghui
34dd708a21 am 50b9eb1c: Merge "Update the documentiation for MediaMuxer::writeSampleData()" into jb-mr2-dev
* commit '50b9eb1c7375a87525d44a036337a8ba18eba55b':
  Update the documentiation for MediaMuxer::writeSampleData()
2013-04-08 10:27:18 -07:00
ztenghui
50b9eb1c73 Merge "Update the documentiation for MediaMuxer::writeSampleData()" into jb-mr2-dev 2013-04-08 17:22:29 +00:00
Nick Kralevich
98cbcf1b50 AppSecurityPermissions: minor UI changes
1) Make the box with the permission really go away when a
permission is revoked, not just invisible.
2) Change the order of the buttons, making the negative
button the "revoke" button, and the positive button "ok".

Change-Id: I73694583cbd014d3820f8df6c6b770caae299499
2013-04-08 10:02:08 -07:00
Daniel Sandler
91fe8455d6 Clean up language in forced foreground service notifications.
Old:  [ IC ] %s running
      [ ON ] %s is running

New:  [ IC ] %s is running
      [ ON ] Touch for more information or to stop the app.

Additionally, disallow these misbehaving services from
supplying their own content views; if you attempt to run a
foreground service with icon == 0, this is the notification
you will get, period.

Bug: 8525548
Change-Id: I2bfd7340396ef925885e8c2160a720f9eff07a35
2013-04-08 13:01:02 -04:00
Daniel Sandler
11c6b66923 am 26c13439: Set FLAG_SHOW_LIGHTS if *either* on or off is nonzero.
* commit '26c134398422a4f4e703cdf7b87fb1cb08d542c4':
  Set FLAG_SHOW_LIGHTS if *either* on or off is nonzero.
2013-04-08 08:17:10 -07:00
Daniel Sandler
fe2902b48b am 0e78de6c: Add tag "foo" to builder test\'s notifications.
* commit '0e78de6c0fadd70277eb29f56ccce97c1dffc4f2':
  Add tag "foo" to builder test's notifications.
2013-04-08 08:17:07 -07:00
Daniel Sandler
26c1343984 Set FLAG_SHOW_LIGHTS if *either* on or off is nonzero.
Previously they each had to be nonzero, which prevented
using the builder methods to create solid-on LED
notifications.

Change-Id: I30314ec33daa28ee2e1f0b87a184c3540254471c
2013-04-08 14:44:28 +00:00
Daniel Sandler
0e78de6c0f Add tag "foo" to builder test's notifications.
This allows them to be conveniently cleared via adb:

  $ adb shell service call notification 5 \
    s16 com.android.statusbartest \
	s16 foo \
	i32 <NOTIFICATIONID> \
	i32 <USERID>

Bug: 8564511
Change-Id: I9fae5a4a0be64d6707cc06ca938adeb8b3c0b735
2013-04-08 14:42:41 +00:00
Chet Haase
cbfce445c5 am edf6f4b4: Make adding views specific to a ViewGroup\'s overlay
* commit 'edf6f4b49f6e77c349f5055372ce381b74f12efb':
  Make adding views specific to a ViewGroup's overlay
2013-04-08 07:35:07 -07:00
Chet Haase
edf6f4b49f Make adding views specific to a ViewGroup's overlay
Adding views to views (possible with the new Overlay API) is weird.
This change moves the view-management facilities of Overlay to a subclass
that is specific to the overlay returned from ViewGroup.getOverlay().
So now you can add drawables to all view overlays, but only add/remove
views to/from the overlay returned from ViewGroup.getOverlay().

Also, the previous approach of using an interface for Overlay was
changed to classes for both ViewOverlay and ViewGroupOverlay.

Finally, this change makes not handling touch correctly the proper,
and documented, behavior of overlay views. There are various tricky issues
to sort out with input in overlays (including click handling as well as focus)
and we don't want developers starting to use overlays as some kind of general
container hierarchy, so we're purposely constraining overlays to have visual-only
behavior.

Issue #8459085 Overlay needs to handle touch correctly

Change-Id: I207b8dbf528f87c92369d270d8b0a6556826d207
2013-04-08 07:30:12 -07:00
The Android Automerger
b678ad4d8d merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-08 05:56:16 -07:00
Ben Gruver
8be8df2141 Implement event logging for intent firewall
Change-Id: If79052d07f3e5c02cfdbd0dd00026b01110045c2
2013-04-07 14:29:34 -07:00
Nick Kralevich
b21b2c38e5 am a56b78dc: fix build
* commit 'a56b78dcd1292a4291d85113bdeeda8496c1a0c0':
  fix build
2013-04-07 11:17:25 -07:00
Nick Kralevich
a56b78dcd1 fix build
Change-Id: I7f3b8a4df84630f40f5a3f19434df86b6287fb75
2013-04-07 11:13:16 -07:00
Nick Kralevich
16843d8488 am d7c4186a: Merge "AppSecurityPermissions: add support for revoking permissions" into jb-mr2-dev
* commit 'd7c4186ae040ed297634b0be11f78592ffc7585f':
  AppSecurityPermissions: add support for revoking permissions
2013-04-07 10:56:57 -07:00
Nick Kralevich
d7c4186ae0 Merge "AppSecurityPermissions: add support for revoking permissions" into jb-mr2-dev 2013-04-07 17:53:27 +00:00
Kenny Root
f1b2c34819 am 8b51475c: Revert "Remove AndroidKeyStore from API"
* commit '8b51475c97f8f2742047976283afbe1f9ef9fcbf':
  Revert "Remove AndroidKeyStore from API"
2013-04-06 10:09:52 -07:00
Kenny Root
8b51475c97 Revert "Remove AndroidKeyStore from API"
This reverts commit ce24985ad636c38b6ee01ec9cdecfb038bfeaeb6.

Change-Id: I02d6492c8db869619694c7209bb37522a7ec5a29
2013-04-06 10:05:31 -07:00
Nick Kralevich
ddfbe00b66 AppSecurityPermissions: add support for revoking permissions
Add UI support for revoking optional permissions. When the user
taps on an optional permission, two new boxes will appear:

  [Cancel] | [Revoke]

Selecting [Revoke] will revoke the permission from the app.

The [Cancel] / [Revoke] options are only shown for apps which support
optional permissions.

Bug: 8332307
Change-Id: I27e374773747737e3a6d7f48ea1448a0178e3393
2013-04-05 18:42:03 -07:00
Raph Levien
a1e6d9eca0 am 42967042: Merge "Update Roboto to version 1.200311" into jb-mr2-dev
* commit '4296704208a9eeb40f4e5fa8d6d1f79c72c322ee':
  Update Roboto to version 1.200311
2013-04-05 16:59:20 -07:00
Adam Powell
dddd59ff63 am e0e2f4fd: Fix accessibility in action bars and add extra customization
* commit 'e0e2f4fd3ac8e70e341ae52d6376d8d67bd9edce':
  Fix accessibility in action bars and add extra customization
2013-04-05 16:55:41 -07:00
Raph Levien
4296704208 Merge "Update Roboto to version 1.200311" into jb-mr2-dev 2013-04-05 23:53:21 +00:00
Adam Powell
e0e2f4fd3a Fix accessibility in action bars and add extra customization
Fix a bug where the content description of the big unified Home/Up
button was not getting set properly.

Add the ability to change the home-as-up glyph from ActionBar.

Add the ability to set a custom action description for the home-as-up
button, useful if the above functionality is used.

Bug 8548229

Change-Id: I0635799772c7234b68247dfc105dce7f11acda32
2013-04-05 16:46:22 -07:00
Geremy Condra
51ad68b9a5 am 212af6db: Merge "Add /data/security path for mac_permissions.xml."
* commit '212af6dbd7b002bdfcc869fc0ee06d5d3d711fd6':
  Add /data/security path for mac_permissions.xml.
2013-04-05 16:40:59 -07:00