Merge commit '33df868bb35726d250c8a6d0ebd8c84749ffd51f'
* commit '33df868bb35726d250c8a6d0ebd8c84749ffd51f':
remove a hack that was used only used on h/w we no longer support.
Merge commit '1eb442eef737051bd2734d823fa4c12c17c1da36' into gingerbread-plus-aosp
* commit '1eb442eef737051bd2734d823fa4c12c17c1da36':
remove a hack that was used only used on h/w we no longer support.
Merge commit '799a5a61d5813be83c4d0814b04c374adfe3a989'
* commit '799a5a61d5813be83c4d0814b04c374adfe3a989': (22 commits)
Properly note the current active restore set's token
Do not log AT command traffic by default.
Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
TimedEventQueue is apparently important for glitch-free media playback, and so
As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
When filling the cache, we always time out waiting for a condition that won't occur.
Respond to changes in throttle policy.
Fix Tethering of multiple downstream ifaces.
Update Framework to support multiple dhpc ranges
Dumb late-night typo.
Use ViewRoot.addConfigCallback instead of a BroadcastReceiver.
Clean up changing AP configuration
Grant permissions to apps on sd when enabling/disabling packages.
Fix issue #2512507: Shortcuts and Widgets lost on upgrading from Eclair to FRE70D
Switch default install location to unspecified.
Fix problem with calling onConfigurationChanged() too much.
Preserve widgets on upgrade.
Need to keep new package's cert when using original-package.
Pick up default install location
Fix 2463886: Allow delayed fetching of DevicePolicyManager in LockPatternUtils.
...
Merge commit '2533a6ad3f378db5f160546d10345730f68d676c' into gingerbread-plus-aosp
* commit '2533a6ad3f378db5f160546d10345730f68d676c': (22 commits)
Properly note the current active restore set's token
Do not log AT command traffic by default.
Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
TimedEventQueue is apparently important for glitch-free media playback, and so
As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
When filling the cache, we always time out waiting for a condition that won't occur.
Respond to changes in throttle policy.
Fix Tethering of multiple downstream ifaces.
Update Framework to support multiple dhpc ranges
Dumb late-night typo.
Use ViewRoot.addConfigCallback instead of a BroadcastReceiver.
Clean up changing AP configuration
Grant permissions to apps on sd when enabling/disabling packages.
Fix issue #2512507: Shortcuts and Widgets lost on upgrading from Eclair to FRE70D
Switch default install location to unspecified.
Fix problem with calling onConfigurationChanged() too much.
Preserve widgets on upgrade.
Need to keep new package's cert when using original-package.
Pick up default install location
Fix 2463886: Allow delayed fetching of DevicePolicyManager in LockPatternUtils.
...
Merge commit '776553934aa254b4240fc84ef6d97105a640348e'
* commit '776553934aa254b4240fc84ef6d97105a640348e':
Support for tapping on an immersive-mode priority notification.
Merge commit '5d7f6e614e7ead1fbe40a6886f78c31809bcbd40' into gingerbread-plus-aosp
* commit '5d7f6e614e7ead1fbe40a6886f78c31809bcbd40':
Support for tapping on an immersive-mode priority notification.
When the user taps on an intruder alert (the priority
notification in immersive mode), the .contentIntent in the
Notification object will be sent, just as we handle tapping
on a normal Notification in the windowshade.
Change-Id: Ib6991837b0b2122fe138cddacf347fdbc426b99d
Merge commit 'd6dcec4f79737623051378cb99858a4032fa8005'
* commit 'd6dcec4f79737623051378cb99858a4032fa8005':
Add qcom's new OMX components to the list.
Merge commit 'fd751426ee05243dc8c29b90ac248fa3df8911a5' into gingerbread-plus-aosp
* commit 'fd751426ee05243dc8c29b90ac248fa3df8911a5':
Add qcom's new OMX components to the list.
Merge commit '591908fd3fd1a84303bbc76c5c44d5cb0ee0bc94'
* commit '591908fd3fd1a84303bbc76c5c44d5cb0ee0bc94':
Extend unit test framework for Wifi soft AP configuration
Merge commit '120a58fb80ec9ba5b62e4b7453ea45703d1ce58a' into gingerbread-plus-aosp
* commit '120a58fb80ec9ba5b62e4b7453ea45703d1ce58a':
Extend unit test framework for Wifi soft AP configuration
has marked itself as being an installable web app. Default implementation
in the WebChromeClient does nothing.
Requires an external/webkit change.
b/2766917
Change-Id: I7aae1b097f866e3d1c6c6a7a31a55bb12ff6a441
Merge commit '059f009d970fb37ac4e408dcf8e1d2d2cdcf0a84' into gingerbread-plus-aosp
* commit '059f009d970fb37ac4e408dcf8e1d2d2cdcf0a84':
Make android.hardware.action.USB_STATE a protected broadcast.
Merge commit 'b54ef61434eb82a53d8c840d86d1d656215604f9' into gingerbread-plus-aosp
* commit 'b54ef61434eb82a53d8c840d86d1d656215604f9':
Separate the status bar height from the icon size.
Our use of web settings does not specify the maximum image size,
although we have some hard-coded values used when decoding the
image. For defective images, the hard-coded values are not enough,
since we may exceed memory in the decoder before the limit is
reached.
Pass along our limits to the decoder, and respect any limits
set by the caller.
companion change in external/webkit
Change-Id: Iabd78165390dddce917f637bd3263b83f9b4aa56
http://b/2689053
Merge commit 'f045ddbad94028399ef1caee08347a264cb3729a'
* commit 'f045ddbad94028399ef1caee08347a264cb3729a':
Notifications: Use new ACTION_USB_STATE broadcast to monitor USB connected state
Merge commit '9be487ce6be705d210d42f8cbe6468226eeb544e'
* commit '9be487ce6be705d210d42f8cbe6468226eeb544e':
Add new Usb.ACTION_USB_STATE sticky broadcast for monitoring USB connect state
Merge commit 'de6bd120c97bb7986a6bac3889288f77bca63288' into gingerbread-plus-aosp
* commit 'de6bd120c97bb7986a6bac3889288f77bca63288':
Notifications: Use new ACTION_USB_STATE broadcast to monitor USB connected state
Merge commit '606d591afee24e31e3885a7330638893db1710f5' into gingerbread-plus-aosp
* commit '606d591afee24e31e3885a7330638893db1710f5':
Add new Usb.ACTION_USB_STATE sticky broadcast for monitoring USB connect state
Merge commit '5d31a4523bf5d1d3e3b5aa51043a1551d7aa56d7'
* commit '5d31a4523bf5d1d3e3b5aa51043a1551d7aa56d7':
fix[2798925] Gingerbread TOT not booting
Revert "Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger""
Merge commit 'f0562b4b071b74a760ad9c9caa0e41687ae6f407' into gingerbread-plus-aosp
* commit 'f0562b4b071b74a760ad9c9caa0e41687ae6f407':
fix[2798925] Gingerbread TOT not booting
Revert "Revert "fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger""
Fixed a typo where checking against the wrong constant caused GL_TEXTURE_EXTERNAL_OES
to be used with a regular texture, which some GL driver will choke on.
Change-Id: I93dfc4c8fa674433bbb678eee31954e9a8d0cb4b