Merge commit '87160757e827e8e158d233de09d70e7128184729' into gingerbread-plus-aosp
* commit '87160757e827e8e158d233de09d70e7128184729':
Basic handling of Notifications with fullScreenIntent.
If a Notification has a non-null fullScreenIntent AND the
topmost Activity is not immersive, that PendingIntent will
fire (presumably causing a nice dialog or full-screen
activity to appear).
Immersive mode handling for FLAG_HIGH_PRIORITY Notifications
is still unimplemented (although the fullScreenIntent will
be suppressed in immersive mode).
Note that currently your fullScreenIntent notification will
also get posted to the status bar, so you're responsible for
clearing it out (e.g. in onPause in your alert intent). See
forthcoming changes to StatusBarTest for an example.
Change-Id: Ie750d1b7bcc788bd29ee1d8626f971dd47fd2817
Merge commit '7dacda1142379df1f1f9854c24e452acdea98436' into gingerbread-plus-aosp
* commit '7dacda1142379df1f1f9854c24e452acdea98436':
docs: Remove the TOS from download flow and remove TOS entirely because
Merge commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8' into gingerbread
* commit '56c778e6cfb2bd47ceae57d81e6b949da306e2e8':
docs: Remove the TOS from download flow and remove TOS entirely because
Merge commit '0a0edccafbd464cfe52fdcb60597e1dd58ca73f9' into gingerbread-plus-aosp
* commit '0a0edccafbd464cfe52fdcb60597e1dd58ca73f9':
Fix the notification vibration setting and add a test app that lets you recover from the busted
Merge commit '2529a45339b7e02d9d2b813358bcecd144a971ea' into gingerbread-plus-aosp
* commit '2529a45339b7e02d9d2b813358bcecd144a971ea':
Make bad notifications crash their application.
Implement notification manager handling of bad notifications, to
call a new activity manager to have the owner's process crashed
(if there is one).
Change-Id: Ib15e8d0c598756f3b39c99cc2045c18e054daf6b
Merge commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961' into gingerbread-plus-aosp
* commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961':
Properly note the current active restore set's token
Merge commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6' into gingerbread
* commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6':
Properly note the current active restore set's token
- Move PackageInfo out of ActivityThread, renaming to LoadedApk.
- Rename some of the other PacakgeInfo inner classes to better
represent what they are.
- Rename HistoryRecord to ActivityRecord.
- Introduce AppGlobals, to eventually let ActivityThread become
package scoped.
Change-Id: Ib714c54ceb3cdbb525dce3db9505f31042e88cf0
Merge commit '9bf39efb1b8527d7c46b20538cbb75bd60900b44' into gingerbread-plus-aosp
* commit '9bf39efb1b8527d7c46b20538cbb75bd60900b44':
Do not log AT command traffic by default.
Merge commit 'ab04f97855a5097815e8e7b99beb42e9b3bac388' into gingerbread-plus-aosp
* commit 'ab04f97855a5097815e8e7b99beb42e9b3bac388':
Do not log AT command traffic by default.
Merge commit 'd19c397b04f485e0af5990f3541e703934869290' into gingerbread
* commit 'd19c397b04f485e0af5990f3541e703934869290':
Do not log AT command traffic by default.
Merge commit '477def1d4216f82bdfe58525131db88b384fc5a5' into gingerbread-plus-aosp
* commit '477def1d4216f82bdfe58525131db88b384fc5a5':
Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.
DO NOT MERGE Add new permission to allow access to USB devices
* changes:
Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.
DO NOT MERGE Add new permission to allow access to USB devices
Merge commit 'a2549bb644d8ca4b0209d6d2f0c4160521789aa9' into gingerbread-plus-aosp
* commit 'a2549bb644d8ca4b0209d6d2f0c4160521789aa9':
Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.
We now broadcast Usb.ACTION_USB_CONNECTED and Usb.ACTION_USB_DISCONNECTED
when USB is connected or disconnected.
The ACTION_USB_CONNECTED extras indicate the enabled/disabled state of
all USB functions.
Change-Id: I11495d039429dbe22bd738067296e39ae415befa
Signed-off-by: Mike Lockwood <lockwood@android.com>
Adds permission android.permission.ACCESS_USB.
This is a partial cherry pick of a change from master.
It adds the permission, but not the support for associating it
the AID_USB group.
Change-Id: If5816721a4fc88bf444141a7b717da65ea37d5f4
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '51e895f055f76ad0114a18e1b754a1475a62c524' into gingerbread-plus-aosp
* commit '51e895f055f76ad0114a18e1b754a1475a62c524':
Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout
Make sure that each input frame contains at least 1024 samples, as
required by the AAC encoder, and fix the incorrect timestamp.
Change-Id: I344cafe8c89be51d6e64552fab70539990ff6049
Merge commit '0379118827ef7e81a70e88e5910f5c7536d8b945' into gingerbread-plus-aosp
* commit '0379118827ef7e81a70e88e5910f5c7536d8b945':
Remember to initialize timestamps in the dispatch allocator
Merge commit '4ca092c7f101cbd95833a9ed8936e9e0485585ad' into gingerbread-plus-aosp
* commit '4ca092c7f101cbd95833a9ed8936e9e0485585ad':
Fix bug 2772728 with the suggested fix. I wasn't able to reproduce it though.
Merge commit '9afc1b3ed3eb8dbfb440600495d92def88934f54' into gingerbread-plus-aosp
* commit '9afc1b3ed3eb8dbfb440600495d92def88934f54':
Fixed some meta data issues in the recorded mp4 file
