Surface::validate() could sometimes dereference a null pointer before checking it wasn't null.
This will prevent the application to crash when given bad parameters or used incorrectly.
However, the bug above probably has another cause.
Merge commit '991475a2e5dcb344299387521b52fb637d6b1e4d' into eclair-plus-aosp
* commit '991475a2e5dcb344299387521b52fb637d6b1e4d':
Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager
Merge commit '65f27f8721ae648ceffffb59a83e2af0d4641920' into eclair-plus-aosp
* commit '65f27f8721ae648ceffffb59a83e2af0d4641920':
Fix the full-weekday date format strings to actually use the full weekday.
Needed for the fix for b/2260437 (device wakes itself back up when camera is last application running)
Change-Id: I0e419fcf05542df203eb3f127dde7a888416e86d
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '73f8aa678055598738dfba54c60a1674bcbf02b1' into eclair-plus-aosp
* commit '73f8aa678055598738dfba54c60a1674bcbf02b1':
Removed the fixed height in the sim unlock screen's header.
Merge commit '9284dec737da58a92b3aa916a357e700d291a68a' into eclair-plus-aosp
* commit '9284dec737da58a92b3aa916a357e700d291a68a':
Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
Merge commit '27d6e65b71f515deafbd93d5aa98732898c34ddf' into eclair-plus-aosp
* commit '27d6e65b71f515deafbd93d5aa98732898c34ddf':
Add support for making a LiveWallpaper the default
Merge commit '826d17c0690e086ed96f43714d731ec6e0ddcf96' into eclair-plus-aosp
* commit '826d17c0690e086ed96f43714d731ec6e0ddcf96':
A little more on #2256270: Package manager sends bad broadcasts when components change
Merge commit 'd05fd6c33518e60664ffdf1bb6cb425f36c2b82f' into eclair-plus-aosp
* commit 'd05fd6c33518e60664ffdf1bb6cb425f36c2b82f':
docs: document the 'showSearchIconAsBadge" flag and
Add check in getOwnerPhoneNumberVcard(). If the incoming phonenumber is empty,
do not add "TEL" to vcard data.
Original Change by: Yue Lixin
DrNo: Eastham
Bug: 2247067
Merge commit 'dbc7e27ef10349f11ac940d59ff4f812319fce51' into eclair
* commit 'dbc7e27ef10349f11ac940d59ff4f812319fce51':
docs: document the 'showSearchIconAsBadge" flag and
Merge commit 'b4c20fca102a2ec6acf1648f2fd16d54fdc07f56' into eclair-plus-aosp
* commit 'b4c20fca102a2ec6acf1648f2fd16d54fdc07f56':
Import revised translations. DO NOT MERGE
Merge commit 'fddfb9ae03a2730ac5ce27fa4c47b7d3a0285d0f' into eclair-plus-aosp
* commit 'fddfb9ae03a2730ac5ce27fa4c47b7d3a0285d0f':
Improvements for issue 2197683: English IME key-press latency is noticeably higher on passion than sholes
Merge commit '5f8f1487be78064e8d653dd2d105d8dd444d6a35' into eclair-plus-aosp
* commit '5f8f1487be78064e8d653dd2d105d8dd444d6a35':
Modify the binder to request 1M - 2 pages instead of 1M. The backing store
* changes:
Modify the binder to request 1M - 2 pages instead of 1M. The backing store in the kernel requires a guard page, so 1M allocations fragment memory very badly. Subtracting a couple of pages so that they fit in a power of two allows the kernel to make more efficient use of its virtual address space.
Merge commit '6f5ba93469bc26f33b5a260a394406970536c260' into eclair-plus-aosp
* commit '6f5ba93469bc26f33b5a260a394406970536c260':
PackageManager: Support secondary ABI for native code at installation time.
Merge commit '572e0087a86c6781e3334f8a6f901039a407138d' into eclair-plus-aosp
* commit '572e0087a86c6781e3334f8a6f901039a407138d':
Return null if SIM doesn't have the MSISDN Aplha tag.
Merge commit '274072089ceff6eacb9ccfb59290a18f43739c87' into eclair-plus-aosp
* commit '274072089ceff6eacb9ccfb59290a18f43739c87':
fix [2236865] STOPSHIP: bump soft gl and egl minor version number
Merge commit '59175ac269df2a584241e9786dc70ac35cb973e3' into eclair-plus-aosp
* commit '59175ac269df2a584241e9786dc70ac35cb973e3':
Defer EGL init until the surface changed call comes in. Pass w,h along with surface for verification of driver state.
Merge commit '2a1e96412c66f22939c010f10524122718c7bbeb' into eclair-plus-aosp
* commit '2a1e96412c66f22939c010f10524122718c7bbeb':
Add code to use Gservices provided values for throtting NITZ updates.
in the kernel requires a guard page, so 1M allocations fragment memory very
badly. Subtracting a couple of pages so that they fit in a power of
two allows the kernel to make more efficient use of its virtual address space.
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
