Romain Guy
72bd95b8fe
am b90ff505: am fdf13c90: Merge "Convert alpha from [0..1] to [0.255] range Bug #8808886 " into jb-mr2-dev
...
* commit 'b90ff505df143abd957cfc19b60727e3460ee68c':
Convert alpha from [0..1] to [0.255] range Bug #8808886
2013-05-06 13:56:23 -07:00
Chet Haase
94268b0dd9
am 33be275d: am d65eebf4: Merge "Fix scaled-view droppings artifact" into jb-mr2-dev
...
* commit '33be275deb072ca3e6155b61370578b16dbee64a':
Fix scaled-view droppings artifact
2013-05-06 13:56:20 -07:00
Fabrice Di Meglio
7caa1a87fe
am a8549041: am 8c2e3a41: Merge "Optimize RTL properties resolution" into jb-mr2-dev
...
* commit 'a8549041ccdf38f8ddbdc5fc2bce84d737a89a7e':
Optimize RTL properties resolution
2013-05-06 13:56:17 -07:00
Svetoslav
100ed154b7
am b0675df8: am faa47b52: Merge "Idle maintenance scheduling broken." into jb-mr2-dev
...
* commit 'b0675df8fd377230edc392e02ba0eba275b57992':
Idle maintenance scheduling broken.
2013-05-06 13:56:14 -07:00
Dianne Hackborn
485d7a31a8
am 5b88a2fd: Debugging help for issue #8734824 : WATCHDOG KILLING SYSTEM PROCESS
...
* commit '5b88a2fd7b77880f6e09ae4a1de509bebe28bc3a':
Debugging help for issue #8734824 : WATCHDOG KILLING SYSTEM PROCESS
2013-05-06 13:47:04 -07:00
Elliott Hughes
601afaef52
Merge "Someone's IDE chose the wrong Date."
2013-05-06 20:29:09 +00:00
Craig Mautner
b59dcfd5e1
Call ensureActivitiesVisibleLocked from supervisor.
...
- Don't call ActivityStack.ensureActivitiesVisibleLocked directly.
Instead call ActivityStackSupervisor.ensureActivitiesVisibleLocked.
- Add detecting monochrome screenshots to black screenshots.
- minor refactors.
Change-Id: I050b1cd40cacaab451f1460a77a82125a8077ff2
2013-05-06 13:12:58 -07:00
Christopher Tate
2baf6dcfcf
Ensure install-during-restore is like install-then-restore
...
When we've installed an apk from the archive, recheck whether
to apply the system-uid policy restrictions around file system
restores.
Bug 8833099
Change-Id: Ifa1b5877673a0d6ca6acf94e60f314fd0dda008c
2013-05-06 13:10:21 -07:00
Svetoslav Ganov
eea52c9a10
am 4337e038: am 62159c0d: Merge "Multiple bindings to the same accessiblity serice if it dies." into jb-mr2-dev
...
* commit '4337e038a20b890885fbcb17e6b8b48da999849c':
Multiple bindings to the same accessiblity serice if it dies.
2013-05-06 12:20:20 -07:00
Dianne Hackborn
c3d95fa664
am 2a44f8d1: am d3956321: Merge "Fix issue #8798662 : NPE in..." into jb-mr2-dev
...
* commit '2a44f8d102a60b1ccca780341cff0b0efb8f19ed':
Fix issue #8798662 : NPE in...
2013-05-06 12:20:17 -07:00
Adam Powell
ef5352c3a1
am f581b533: am 2b662e8e: Merge "Fix a NPE in MenuItemImpl when setting null ActionProvider" into jb-mr2-dev
...
* commit 'f581b533cf0ff774405bae057f5883fe9768c6a8':
Fix a NPE in MenuItemImpl when setting null ActionProvider
2013-05-06 12:20:14 -07:00
quddusc
82700920d7
am 91091ea6: am 5d3e89be: am d6aa68b6: am 564a533e: am 66442b56: am 775deb88: am 9af97443: Merge "docs: Added landing page for Google Play Games Platform Services. cherrypick from jb-mr1-dev docs: Play Games changes Change-Id: I5117db8511907e05ddc84005bf6903251de46f7
...
* commit '91091ea6923b2439e3a309b08548b4b23339a725':
docs: Added landing page for Google Play Games Platform Services. cherrypick from jb-mr1-dev docs: Play Games changes Change-Id: I5117db8511907e05ddc84005bf6903251de46f71
2013-05-06 12:20:11 -07:00
Jesse Hall
237c2b871f
Register EGLExt JNI methods
...
Bug: 8678160
Change-Id: I8ecd2e6da2aee250b3433be18fff6af927b02994
2013-05-06 11:36:59 -07:00
Zhentao Sun
cfa496f7cd
Fixed unreleased wake lock isues and NPE.
...
Fixed b/8834502. Wake lock might not be released when the callback is null.
NPE is thrown when the callback is null in some cases too.
Change-Id: I27d3af810669e446cfb57aba8715c80cba3e15e7
2013-05-06 11:22:44 -07:00
Romain Guy
f29f0fbe56
Merge "Remove stray log"
2013-05-06 18:22:27 +00:00
Dianne Hackborn
5b88a2fd7b
Debugging help for issue #8734824 : WATCHDOG KILLING SYSTEM PROCESS
...
IActivityController has a new callback which the Watchdog calls
when it detects that the system process is hung. This may be
use full monkey. All hail the monkey!
Also add a new private feature to Binder to be able to turn off
all incoming dump() calls to a process. The watchdog uses this
when it reports it is hung, so that if someone, say, wants to
collect a bug report at this point they won't get stuck waiting
for things that are all busted.
Change-Id: Ib514d97451cf3b93f29e194c1954e29f948c13b1
2013-05-06 11:16:18 -07:00
Romain Guy
1f8a0db348
Remove stray log
...
Change-Id: I392eea216ad67f376ded802c19a3e2287aacc6f8
2013-05-06 11:15:28 -07:00
Baligh Uddin
966b340e7d
am 996f6b04: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '996f6b048ba03ca727c40e1bc33100bf45c93518':
Import translations. DO NOT MERGE
2013-05-06 11:12:13 -07:00
Robert Greenwalt
8c04cd041d
am 341666c4: Merge "Fix sync problem in NsdManager" into jb-mr2-dev
...
* commit '341666c40d222145f7dfd44bdbed48590c4dc5da':
Fix sync problem in NsdManager
2013-05-06 11:12:02 -07:00
Michael Jurka
664f785e2c
am 72f2a7af: Merge "Fix bug where thumbnails in Recents disappear" into jb-mr2-dev
...
* commit '72f2a7af828056fc426d936c1d40cb6bbdbdf7c7':
Fix bug where thumbnails in Recents disappear
2013-05-06 11:11:54 -07:00
Dave Burke
38996cdcf1
am 236cc476: Temporarily revert field name change (DO NOT MERGE)
...
* commit '236cc476e6792a11502ba4f40c7ab4586f40d282':
Temporarily revert field name change (DO NOT MERGE)
2013-05-06 11:11:51 -07:00
Dirk Dougherty
db4f24a6c7
am 96f69cbe: am 20860a3f: am 79ebe80a: am e34ecc9a: am 3dbb173e: am c3a7ea42: Doc change: Update landing pages for Google Play Services.
...
* commit '96f69cbec3112e87e9d7bc451bf142a6e6918113':
Doc change: Update landing pages for Google Play Services.
2013-05-06 11:11:27 -07:00
Jesse Hall
78df7b5e78
am 02b7128f: Merge "Add android.opengl.EGLExt class for EGL extensions" into jb-mr2-dev
...
* commit '02b7128f87ce55693cb6401ab09a5e47b5db5cb5':
Add android.opengl.EGLExt class for EGL extensions
2013-05-06 11:11:21 -07:00
Romain Guy
b90ff505df
am fdf13c90: Merge "Convert alpha from [0..1] to [0.255] range Bug #8808886 " into jb-mr2-dev
...
* commit 'fdf13c90cb6b412dd93ae6a8990bf962e0d71407':
Convert alpha from [0..1] to [0.255] range Bug #8808886
2013-05-06 11:11:12 -07:00
Chet Haase
33be275deb
am d65eebf4: Merge "Fix scaled-view droppings artifact" into jb-mr2-dev
...
* commit 'd65eebf4d97dd3812f02e7755e5b399c27e49f71':
Fix scaled-view droppings artifact
2013-05-06 11:11:09 -07:00
Fabrice Di Meglio
a8549041cc
am 8c2e3a41: Merge "Optimize RTL properties resolution" into jb-mr2-dev
...
* commit '8c2e3a412aaee8359a48265a101ca27e7b67301c':
Optimize RTL properties resolution
2013-05-06 11:11:03 -07:00
Svetoslav
b0675df8fd
am faa47b52: Merge "Idle maintenance scheduling broken." into jb-mr2-dev
...
* commit 'faa47b526fc35be01b1bc46a78679adde87f6701':
Idle maintenance scheduling broken.
2013-05-06 11:10:57 -07:00
Baligh Uddin
fec12d1f16
Merge "Import translations. DO NOT MERGE"
2013-05-06 18:09:58 +00:00
Baligh Uddin
996f6b048b
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-05-06 18:07:30 +00:00
Elliott Hughes
c00df6d52e
Someone's IDE chose the wrong Date.
...
Part 1 of the mystery of the java.sql.Date in preloaded-classes solved.
Change-Id: I33fffec1f86e34167a76afc839d9f4ce31fa31f7
2013-05-06 10:53:28 -07:00
Baligh Uddin
4c76214fe7
Import translations. DO NOT MERGE
...
Change-Id: Ib1038b7f235b8f7388d2472fd1cab81a611b04c2
Auto-generated-cl: translation import
2013-05-06 09:55:32 -07:00
Baligh Uddin
4ad81d3d55
Import translations. DO NOT MERGE
...
Change-Id: I01cd4ffdc63f281e3a4143376f37264d1af40dc9
Auto-generated-cl: translation import
2013-05-06 09:46:51 -07:00
Robert Greenwalt
341666c40d
Merge "Fix sync problem in NsdManager" into jb-mr2-dev
2013-05-06 16:37:44 +00:00
Baligh Uddin
d43ecb5462
Import translations. DO NOT MERGE
...
Change-Id: Ibceb0c93f3886cc191b9cd7d2fe026fb0d39c5da
Auto-generated-cl: translation import
2013-05-06 09:35:57 -07:00
Svetoslav Ganov
4337e038a2
am 62159c0d: Merge "Multiple bindings to the same accessiblity serice if it dies." into jb-mr2-dev
...
* commit '62159c0d854737f8dc519fba01fd28adea26e57f':
Multiple bindings to the same accessiblity serice if it dies.
2013-05-06 08:44:49 -07:00
Dianne Hackborn
2a44f8d102
am d3956321: Merge "Fix issue #8798662 : NPE in..." into jb-mr2-dev
...
* commit 'd3956321c173beb1fb096b5171e76ba7b7e1bc1e':
Fix issue #8798662 : NPE in...
2013-05-06 08:44:47 -07:00
Adam Powell
f581b533cf
am 2b662e8e: Merge "Fix a NPE in MenuItemImpl when setting null ActionProvider" into jb-mr2-dev
...
* commit '2b662e8ef96c645e38a3debc29afa7454664f6cb':
Fix a NPE in MenuItemImpl when setting null ActionProvider
2013-05-06 08:44:33 -07:00
quddusc
91091ea692
am 5d3e89be: am d6aa68b6: am 564a533e: am 66442b56: am 775deb88: am 9af97443: Merge "docs: Added landing page for Google Play Games Platform Services. cherrypick from jb-mr1-dev docs: Play Games changes Change-Id: I5117db8511907e05ddc84005bf6903251de46f71" into jb-mr
...
* commit '5d3e89beb090cdfa1e305025a4e10f0591b2fa66':
docs: Added landing page for Google Play Games Platform Services. cherrypick from jb-mr1-dev docs: Play Games changes Change-Id: I5117db8511907e05ddc84005bf6903251de46f71
2013-05-06 08:44:31 -07:00
Michael Jurka
72f2a7af82
Merge "Fix bug where thumbnails in Recents disappear" into jb-mr2-dev
2013-05-06 11:42:24 +00:00
Dave Burke
236cc476e6
Temporarily revert field name change (DO NOT MERGE)
...
VisualOn is using hidden fields, causing HBO and Xfinity to crash.
Bug: 8549617
Bug: 8331866
Change-Id: I35a9fe66dea8d56f4fcff9b492679226a17f4acc
2013-05-06 00:21:30 -07:00
Dirk Dougherty
96f69cbec3
am 20860a3f: am 79ebe80a: am e34ecc9a: am 3dbb173e: am c3a7ea42: Doc change: Update landing pages for Google Play Services.
...
* commit '20860a3f8b6a37719fc59fce1b1267b92efef5a3':
Doc change: Update landing pages for Google Play Services.
2013-05-04 12:01:07 -07:00
Dirk Dougherty
20860a3f8b
am 79ebe80a: am e34ecc9a: am 3dbb173e: am c3a7ea42: Doc change: Update landing pages for Google Play Services.
...
* commit '79ebe80a85ce97e3278f51e11086a2b89e09f86d':
Doc change: Update landing pages for Google Play Services.
2013-05-04 11:58:43 -07:00
Jesse Hall
02b7128f87
Merge "Add android.opengl.EGLExt class for EGL extensions" into jb-mr2-dev
2013-05-04 17:50:48 +00:00
Dirk Dougherty
79ebe80a85
am e34ecc9a: am 3dbb173e: am c3a7ea42: Doc change: Update landing pages for Google Play Services.
...
* commit 'e34ecc9a06f4a626cc78c648e621c4b7bb4a1242':
Doc change: Update landing pages for Google Play Services.
2013-05-04 10:32:46 -07:00
Dirk Dougherty
e34ecc9a06
am 3dbb173e: am c3a7ea42: Doc change: Update landing pages for Google Play Services.
...
* commit '3dbb173e8d9ae7893a10a76b1b7fed66f1adb25b':
Doc change: Update landing pages for Google Play Services.
2013-05-04 10:30:55 -07:00
Dirk Dougherty
3dbb173e8d
am c3a7ea42: Doc change: Update landing pages for Google Play Services.
...
* commit 'c3a7ea424d96aac02762ab6819429e3fa52d9a25':
Doc change: Update landing pages for Google Play Services.
2013-05-04 10:29:01 -07:00
Dirk Dougherty
c3a7ea424d
Doc change: Update landing pages for Google Play Services.
...
Change-Id: I7cfc64928e7a2b195ed52febc6f7b652d85e9c56
2013-05-03 18:50:11 -07:00
Romain Guy
fdf13c90cb
Merge "Convert alpha from [0..1] to [0.255] range Bug #8808886 " into jb-mr2-dev
2013-05-04 01:42:46 +00:00
Chet Haase
d65eebf4d9
Merge "Fix scaled-view droppings artifact" into jb-mr2-dev
2013-05-04 01:35:23 +00:00
Fabrice Di Meglio
8c2e3a412a
Merge "Optimize RTL properties resolution" into jb-mr2-dev
2013-05-04 00:48:12 +00:00