Merge commit 'c58e9bff10200daaad6d06d57745edcc33314325'
* commit 'c58e9bff10200daaad6d06d57745edcc33314325':
Maybe fix#3076572: phone process crashes in SipService, trying to get wifi lock
Merge commit '2aaa1ce1768d3425c07e55d43aaa400282424f8c' into gingerbread-plus-aosp
* commit '2aaa1ce1768d3425c07e55d43aaa400282424f8c':
Hold partial wakelock during shutdown to avoid entering sleep
Merge commit '0e430ccc2c8a4bb9d96002676d7742652bd28477' into gingerbread-plus-aosp
* commit '0e430ccc2c8a4bb9d96002676d7742652bd28477':
Telephony: Fix radio state printing
Merge commit 'fb1e5529724d121aa47485e7245b69965088fbb4' into gingerbread-plus-aosp
* commit 'fb1e5529724d121aa47485e7245b69965088fbb4':
Fix time zone info in kernel is nothing after reboot
Merge commit '6b8bdaa9c802746eabc4e96686739dbce34c2fbc' into gingerbread-plus-aosp
* commit '6b8bdaa9c802746eabc4e96686739dbce34c2fbc':
New AppsPermission and market style
Only print the debug if script debugging is enabled.
Change-Id: I72b9c2a73d49987a73b354442e9defec02b93bc6
Implement inner utiliy class to specify surface formats.
Remove boxed bitmap upload functions.
Change-Id: I3ff5ca59e53d02b9d75277afa947ea3d218459eb
Merge commit 'd5423321b920be10c00fbcbc5a702f15e00693a5'
* commit 'd5423321b920be10c00fbcbc5a702f15e00693a5':
Fix issue #3074745: Crash in system process
Merge commit 'e0c8545a2369881fe09582337a9de3db2db1a951'
* commit 'e0c8545a2369881fe09582337a9de3db2db1a951':
Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR.
Merge commit 'ab70a98b0ec450379fa953a9fe911109329b9c37'
* commit 'ab70a98b0ec450379fa953a9fe911109329b9c37':
DO NOT MERGE Adjust amount pull effects the glow and edge decay.
The Linux kernel supports reporting "cold" battery health to sysfs.
Android framework has not implemented this and it defaults to "unknown"
This adds handling the cold battery health.
Change-Id: Idcc156aae6aabce73391081143f79d052edf332e
Merge commit '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7'
* commit '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7':
Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.
Merge commit '5dcf588a81a59142985736d8bb0430586f68ec08'
* commit '5dcf588a81a59142985736d8bb0430586f68ec08':
Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams.
Merge commit '14ea1048e7e8a4b40836b5601bc86b91663525cb'
* commit '14ea1048e7e8a4b40836b5601bc86b91663525cb':
Disable the access unit timeout temporarily while a seek operation is in progress.
Merge commit 'bd1454f5005619b69d887fee6a7a4891b3323d18' into gingerbread-plus-aosp
* commit 'bd1454f5005619b69d887fee6a7a4891b3323d18':
Include debugger connection status in error entry
Merge commit '2f77c3e4de3d68904a6a872d53283775b3a5c349' into gingerbread-plus-aosp
* commit '2f77c3e4de3d68904a6a872d53283775b3a5c349':
GPS: Fix another race condition in GPS HAL initialization
Currently the SipPhone class manually creates a CallerInfo object, and
populates it with very basic info from the SIP address, when making an
outgoing call.
But this is no longer needed, now that we do caller-id lookup properly for
SIP addresses (based on real data from the contacts database -- see
bug 3004127 and change https://android-git.corp.google.com/g/70555).
And in fact the presence of this initial CallerInfo object actually
*disabled* contacts lookup for outgoing calls (bug 3072731).
This change removes all that CallerInfo-related stuff from SipPhone.
(Thus SipPhone is now consistent with the other phone objects, like
GSMPhone and CDMAPhone, in that it doesn't muck with CallerInfo data at
all, but instead lets the phone app do it.)
Also, update isUriNumber() to handle "%40" in case the passed-in string is
URI-escaped. (Nobody depends on that now, but it may be needed in the
future, and it's certainly safe to say that "%40" will never be found in a
legal PSTN number.)
TESTED:
- Outgoing SIP call:
- In-call UI shows correct contact info
- After the call, Call Log shows correct contact info
- Incoming SIP call:
- In-call UI shows correct contact info
- After the call, Call Log shows correct contact info
- PSTN calls:
- correct contact info everywhere
Bug: 3072731
Change-Id: I51434e4e5ad66d2e8ff51fc220001fb74485f0f5
Merge commit 'b8f7a4831ac26d0447fd8a2982416b2627a286b5' into gingerbread-plus-aosp
* commit 'b8f7a4831ac26d0447fd8a2982416b2627a286b5':
bug:3082865 don't use IN to construct sql to delete downloads
DownloadManager should not use IN clause when constructing
SQL to delete downloaded files Dowload app.
Lexer code in Download app doesn't know how to parse it.
Real fix is to fix Lexer.
But seriously real fix is to get rid of this complexity -
that I am planning for next version.
also, the following 2 are identical, in terms of SQL performance
WHERE _id IN (?, ?, ?)
WHERE (_id = ? OR _id = ? OR _id = ?)
Change-Id: Icca659a17c412247a193879e8d2f34e1b43ec9e5
Merge commit 'dd644c179c1bf47d82d776d7f644e4fc1467159d' into gingerbread-plus-aosp
* commit 'dd644c179c1bf47d82d776d7f644e4fc1467159d':
Fallback to SharedPreferences$Editor.commit() when no apply() exists.
