Chet Haase
85c1aef929
am 6534dd02: am 74261d84: Merge "Don\'t null the reference to Bitmap pixels until we\'re really ready" into jb-mr1-dev
...
* commit '6534dd0275c8d01de7e7400ba239d203c37c8164':
Don't null the reference to Bitmap pixels until we're really ready
2012-10-22 15:52:20 -07:00
Chet Haase
6534dd0275
am 74261d84: Merge "Don\'t null the reference to Bitmap pixels until we\'re really ready" into jb-mr1-dev
...
* commit '74261d847f64ccfeba0a7f08f6c59473a3b6647d':
Don't null the reference to Bitmap pixels until we're really ready
2012-10-22 15:49:22 -07:00
Chet Haase
74261d847f
Merge "Don't null the reference to Bitmap pixels until we're really ready" into jb-mr1-dev
2012-10-22 15:46:43 -07:00
Baligh Uddin
dfef8761a4
am 177d984a: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '177d984ab91661953259d5329ed01ded5a497d43':
Import translations. DO NOT MERGE
2012-10-22 15:37:19 -07:00
Baligh Uddin
f3e54d692f
am 8d98421f: am 5be59670: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '8d98421ff5d6fc31470f7080e6cb5234a60c4036':
Import translations. DO NOT MERGE
2012-10-22 15:34:11 -07:00
Baligh Uddin
177d984ab9
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-22 15:33:14 -07:00
Baligh Uddin
8d98421ff5
am 5be59670: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '5be59670c26edf27bfdfdf0430b535dda718bd9d':
Import translations. DO NOT MERGE
2012-10-22 15:31:49 -07:00
Baligh Uddin
5be59670c2
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-22 15:28:42 -07:00
Chet Haase
547e66531d
Don't null the reference to Bitmap pixels until we're really ready
...
A change in the VM triggers a native memory error more aggressively than before,
showing that there's a bug in the logic of recycling bitmaps. Since the pixel
memory is allocated on the Java heap, nulling out the reference to that memory
in the Java level Bitmap object can cause that memory to get collected at any time.
Meanwhile, we may have a reference to that memory at the native level for rendering
purposes, causing an error if/when we access that memory after it has been collected
by the VM.
The fix is to avoid setting the reference to the pixels to null unless we are
not referring to it in native code. This is determined at the time we call
recycle() - we return a boolean to indicate whether the native code is still
using the memory. if not, the Java code can null out the reference and allow the
VM to collect it. Otherwise, it will get collected later when the encompassing
Bitmap object is collected.
Issue #7339156 HTML5 tests crash the app (Vellamo)
Change-Id: I3a0d6b9a6c5dd3b86cc2b0ff7719007e774b5e3c
2012-10-22 15:25:19 -07:00
Colin Cross
3ebec52947
am 08306ca0: am 034b386c: Merge "Add ro.revision property to checkin headers" into jb-mr1-dev
...
* commit '08306ca06025b71c5006e0323c9ff69f7e0d7c4a':
Add ro.revision property to checkin headers
2012-10-22 14:26:05 -07:00
Colin Cross
08306ca060
am 034b386c: Merge "Add ro.revision property to checkin headers" into jb-mr1-dev
...
* commit '034b386ccfc42bc9b44e728bb39959c81b1d2e8c':
Add ro.revision property to checkin headers
2012-10-22 14:23:46 -07:00
Colin Cross
034b386ccf
Merge "Add ro.revision property to checkin headers" into jb-mr1-dev
2012-10-22 14:20:06 -07:00
Colin Cross
8b2c916a8d
Add ro.revision property to checkin headers
...
Early hardware revisions often have known issues. Add the ro.revision
property to the header for the checkin reports so known issues can
be easily filtered.
Change-Id: I337b09ddfa41ebbe7f8f56223392b0bd491f897b
2012-10-22 14:01:36 -07:00
Jamie Gennis
5bbfcd3e15
am 9fee7bd7: am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev
...
* commit '9fee7bd73d1231172267cde99d2374cf072c2dca':
Set the secureness when creating displays
2012-10-22 13:54:53 -07:00
Jamie Gennis
9fee7bd73d
am 23d62241: Merge "Set the secureness when creating displays" into jb-mr1-dev
...
* commit '23d622418b5c67dc43faabd930d1c59c5ce34f6a':
Set the secureness when creating displays
2012-10-22 13:52:12 -07:00
Svetoslav Ganov
8ad9c9df00
am a96040a7: am d07f8d0b: Merge "Re-fixing content descritpion on quick settings toggle. Bug: 7362316" into jb-mr1-dev
...
* commit 'a96040a7d447382a2477df4f5a91b8319c3b6545':
Re-fixing content descritpion on quick settings toggle. Bug: 7362316
2012-10-22 13:51:10 -07:00
Jamie Gennis
23d622418b
Merge "Set the secureness when creating displays" into jb-mr1-dev
2012-10-22 13:49:35 -07:00
Svetoslav Ganov
a96040a7d4
am d07f8d0b: Merge "Re-fixing content descritpion on quick settings toggle. Bug: 7362316" into jb-mr1-dev
...
* commit 'd07f8d0b373fa4581c6b11738931c8f9fbd79ac7':
Re-fixing content descritpion on quick settings toggle. Bug: 7362316
2012-10-22 13:48:16 -07:00
Svetoslav Ganov
d07f8d0b37
Merge "Re-fixing content descritpion on quick settings toggle. Bug: 7362316" into jb-mr1-dev
2012-10-22 13:45:13 -07:00
Victoria Lease
c018f08a88
am 43a88375: am 92d99223: Merge "LocationManager javadoc permission fixes" into jb-mr1-dev
...
* commit '43a883759fe40216650782b3f78d42fdcfb7b589':
LocationManager javadoc permission fixes
2012-10-22 13:44:16 -07:00
Victoria Lease
43a883759f
am 92d99223: Merge "LocationManager javadoc permission fixes" into jb-mr1-dev
...
* commit '92d9922370ffe50932361602f46b275d085e61b8':
LocationManager javadoc permission fixes
2012-10-22 13:41:15 -07:00
Victoria Lease
92d9922370
Merge "LocationManager javadoc permission fixes" into jb-mr1-dev
2012-10-22 13:38:09 -07:00
Amith Yamasani
e78d50b4a0
am 6eb9844c: am 22788981: Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev
...
* commit '6eb9844c8e4ff36ebb58a9e5223e69adea1156cf':
System server should always send broadcasts to a specific or all users
2012-10-22 13:37:19 -07:00
Amith Yamasani
6eb9844c8e
am 22788981: Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev
...
* commit '2278898126c1cea4bd345bb96313d381b4ad3993':
System server should always send broadcasts to a specific or all users
2012-10-22 13:35:21 -07:00
Amith Yamasani
2278898126
Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev
2012-10-22 13:32:24 -07:00
Victoria Lease
2291ca47c7
LocationManager javadoc permission fixes
...
The javadoc mistakenly claimed that GPS and PASSIVE location
providers could be used with ACCESS_COARSE_LOCATION permissions.
That was incorrect, and the javadoc has been amended.
Bug: 7389249
Change-Id: I6f6489bb539679a962c67ae7263857700df33c82
2012-10-22 12:53:32 -07:00
Amith Yamasani
cd75706117
System server should always send broadcasts to a specific or all users
...
Bug: 7368245
Log a warning if the system process calls unqualified sendBroadcast()
and other calls.
As a result of the logging above, found a few more method calls such as
bindService() that would benefit from being more explicit to avoid
future confusion and reduce the log warnings.
Change-Id: I17f15c8be9adf7becd456d6abbab606f19befdbf
2012-10-22 12:38:53 -07:00
Adam Powell
f4c6a4e42e
am cad6dce5: am cd92db84: Merge "Remove View\'s long press callbacks when ACTION_CANCEL is received" into jb-mr1-dev
...
* commit 'cad6dce59653bf0a5ad015ab936948497f58b3b4':
Remove View's long press callbacks when ACTION_CANCEL is received
2012-10-22 12:34:18 -07:00
Adam Powell
cad6dce596
am cd92db84: Merge "Remove View\'s long press callbacks when ACTION_CANCEL is received" into jb-mr1-dev
...
* commit 'cd92db84c6d9e0c9992abfbbda45d504c7f5e062':
Remove View's long press callbacks when ACTION_CANCEL is received
2012-10-22 12:31:35 -07:00
Adam Powell
cd92db84c6
Merge "Remove View's long press callbacks when ACTION_CANCEL is received" into jb-mr1-dev
2012-10-22 12:29:02 -07:00
Daniel Sandler
d36929110d
am 45fc052d: am a4be1b2b: Merge "Fix empty notification panel." into jb-mr1-dev
...
* commit '45fc052d64b46967955b72e6587d8c969a024aae':
Fix empty notification panel.
2012-10-22 12:21:07 -07:00
Daniel Sandler
733993762e
am 03b86a9b: am 564c03da: Merge "Really hide the settings button on tablets." into jb-mr1-dev
...
* commit '03b86a9b23f1298884d3394771d20d4039ed24ef':
Really hide the settings button on tablets.
2012-10-22 12:19:15 -07:00
Daniel Sandler
45fc052d64
am a4be1b2b: Merge "Fix empty notification panel." into jb-mr1-dev
...
* commit 'a4be1b2bcdc768708f594b69923986617a367820':
Fix empty notification panel.
2012-10-22 12:17:26 -07:00
Adam Powell
5311c4476e
Remove View's long press callbacks when ACTION_CANCEL is received
...
Bug 7391646
Change-Id: Icd100d3eff63a54c892367fb70dec517257a01f8
2012-10-22 12:15:49 -07:00
Daniel Sandler
03b86a9b23
am 564c03da: Merge "Really hide the settings button on tablets." into jb-mr1-dev
...
* commit '564c03dac59ecd2255bba658b254fd1f5672ec22':
Really hide the settings button on tablets.
2012-10-22 12:15:35 -07:00
Daniel Sandler
a4be1b2bcd
Merge "Fix empty notification panel." into jb-mr1-dev
2012-10-22 12:14:13 -07:00
Daniel Sandler
564c03dac5
Merge "Really hide the settings button on tablets." into jb-mr1-dev
2012-10-22 12:12:48 -07:00
Baligh Uddin
23a78f3105
Import translations. DO NOT MERGE
...
Change-Id: Iecf97b4e7ed628d9617fae86007efa7236c3fe15
Auto-generated-cl: translation import
2012-10-22 12:00:30 -07:00
Baligh Uddin
363d08ca61
Import translations. DO NOT MERGE
...
Change-Id: I9d70c86dd322b296e52be5d18ec38be48cdbcc7a
Auto-generated-cl: translation import
2012-10-22 11:59:56 -07:00
Daniel Sandler
50bc4f5a7c
Fix empty notification panel.
...
If the panel closed before the flip animation completed, you
would have had a bad time.
Bug: 7391510
Change-Id: I45c29de45b718bc63e7be1a5544c1f73ac6f46e0
2012-10-22 14:47:55 -04:00
Daniel Sandler
7382a025a7
Really hide the settings button on tablets.
...
Bug: 7382185
Change-Id: Id452e2499ba2089b8cfb0071b6aedf6d1d917b35
2012-10-22 14:37:20 -04:00
Michael Jurka
6e48d39920
am 662cfc2a: am 39c65262: Merge "Add NPE check to fix crash in Recents" into jb-mr1-dev
...
* commit '662cfc2a1139f27c54b6e8465ceb18fe67a9682b':
Add NPE check to fix crash in Recents
2012-10-22 11:19:22 -07:00
Michael Jurka
662cfc2a11
am 39c65262: Merge "Add NPE check to fix crash in Recents" into jb-mr1-dev
...
* commit '39c6526249a27b9dd9252910adecf8353b0792f0':
Add NPE check to fix crash in Recents
2012-10-22 11:16:21 -07:00
Michael Jurka
39c6526249
Merge "Add NPE check to fix crash in Recents" into jb-mr1-dev
2012-10-22 11:12:01 -07:00
Michael Jurka
2a430cccc2
Add NPE check to fix crash in Recents
...
Bug: 7383315
2012-10-22 10:56:18 -07:00
Jeff Brown
e0ba56f26c
am 8d48e401: am d6e3ad54: Merge "Reduce screen on/off latency." into jb-mr1-dev
...
* commit '8d48e401b8dc909636de129f860fa083d1755612':
Reduce screen on/off latency.
2012-10-22 10:42:25 -07:00
Jeff Brown
8d48e401b8
am d6e3ad54: Merge "Reduce screen on/off latency." into jb-mr1-dev
...
* commit 'd6e3ad54907ec085aa41e5c77296e9f385c22e67':
Reduce screen on/off latency.
2012-10-22 10:40:14 -07:00
Jeff Brown
d6e3ad5490
Merge "Reduce screen on/off latency." into jb-mr1-dev
2012-10-22 10:36:59 -07:00
Dianne Hackborn
56a1fe561c
am fbe09246: am f584f111: Merge "Fix issue #7353900 : Brief flash of home screen while dream starts on lock screen." into jb-mr1-dev
...
* commit 'fbe092462c8b753c533728634cbb75413a0b661a':
Fix issue #7353900 : Brief flash of home screen while dream starts on lock screen.
2012-10-22 10:34:35 -07:00
Baligh Uddin
dfa4e837ad
am d48aae5f: am e53f5265: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'd48aae5f2ef3b05ed2480dfa473bb072e3326215':
Import translations. DO NOT MERGE
2012-10-22 10:34:32 -07:00