Andreas Gampe
dde7286273
am 7db6ebe0: Merge "Frameworks/base: Don\'t allocate another identity matrix"
...
* commit '7db6ebe03719dfc6b9fb680b038fd9ef0302e4ca':
Frameworks/base: Don't allocate another identity matrix
2015-03-24 16:14:33 +00:00
Andreas Gampe
7db6ebe037
Merge "Frameworks/base: Don't allocate another identity matrix"
2015-03-24 16:02:55 +00:00
John Reck
05bb06fd49
am 540e1f8c: Merge "Don\'t create unnecessary RenderThread\'s instance when executing \'dumpsys gfxinfo\'"
...
* commit '540e1f8cbcbc255ca57fba81befd4d6346178cec':
Don't create unnecessary RenderThread's instance when executing 'dumpsys gfxinfo'
2015-03-24 14:55:54 +00:00
John Reck
540e1f8cbc
Merge "Don't create unnecessary RenderThread's instance when executing 'dumpsys gfxinfo'"
2015-03-24 14:44:06 +00:00
Craig Mautner
26d577b08f
am f8a2ba51: Merge "Prevent unexpected rotation while going back to keyguard"
...
* commit 'f8a2ba511ee2dc5360f323c71eff5e0f2465dd99':
Prevent unexpected rotation while going back to keyguard
2015-03-23 22:03:14 +00:00
Craig Mautner
f8a2ba511e
Merge "Prevent unexpected rotation while going back to keyguard"
2015-03-23 21:48:57 +00:00
Miao Wang
6f6f44b038
am b2b0c4c2: Merge "[RenderScript] Add create(Context, int) to be compatible with the thunker layer & minor tweaks."
...
* commit 'b2b0c4c2072459612c6ed078d84b189cba326de1':
[RenderScript] Add create(Context, int) to be compatible with the thunker layer & minor tweaks.
2015-03-23 21:15:35 +00:00
Miao Wang
b2b0c4c207
Merge "[RenderScript] Add create(Context, int) to be compatible with the thunker layer & minor tweaks."
2015-03-23 21:01:59 +00:00
Anthony Hugh
09ebc52a85
am 7c08dd61: Merge "DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier" into lmp-mr1-modular-dev
...
* commit '7c08dd61c43d76241c8f47c5aae934486605a80e':
DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier
2015-03-23 20:21:58 +00:00
Anthony Hugh
7c08dd61c4
Merge "DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier" into lmp-mr1-modular-dev
2015-03-23 20:15:50 +00:00
Adam Lesinski
11cc1f166d
DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier
...
Some UI is displayed (boot/optimizing) before the configuration
has been completely set. This noteably happens for watches and
TVs because UIModeManagerService hasn't started yet.
UIModeManagerService is started earlier, and its dependency
TwilightService is loaded during the "all system services ready"
boot phase.
b/18388692
Change-Id: Iabdf8ac3eb04ebcb44779d752e19042769cc65c6
2015-03-23 12:02:52 -07:00
Miao Wang
a4e5adf955
[RenderScript] Add create(Context, int) to be compatible with
...
the thunker layer & minor tweaks.
bug:19888167
bug:19888339
Change-Id: Ib264c4ca48c990b3476456838047f73d95f6752f
2015-03-23 11:50:18 -07:00
Michael Wright
b42baaa829
am 978cfc39: Merge "SystemUI needs the SET_WALLPAPER permission"
...
* commit '978cfc39a10e1b95f9d6dfb5c8e9eb58a10ce0ec':
SystemUI needs the SET_WALLPAPER permission
2015-03-23 15:55:53 +00:00
Michael Wright
978cfc39a1
Merge "SystemUI needs the SET_WALLPAPER permission"
2015-03-23 15:43:23 +00:00
Samuel Asteberg
8d516a80a0
SystemUI needs the SET_WALLPAPER permission
...
If changing wallpaper when low on memory, retrieving the default
wallpaper may return null, which triggers error handling in
ImageWallpaper. This error handling tries to perform
WallpaperManager.clear(), but for that it needs SET_WALLPAPER
permission, which it does not have.
For users with apps that auto change wallpaper, this issue can
be frequent in low-memory conditions.
The solution is to add the permisson.
Change-Id: I81503c1667e3952c2dd15599969f7dcc51623e5b
2015-03-23 13:50:09 +01:00
Geoff Mendal
2f12b803e9
am eded9424: (-s ours) Import translations. DO NOT MERGE
...
* commit 'eded9424305cb6538cc0516670930a9f8fccbfd1':
Import translations. DO NOT MERGE
2015-03-23 12:49:39 +00:00
Geoff Mendal
eded942430
Import translations. DO NOT MERGE
...
Change-Id: I911df3cb6476017bb6723403dbabb2dfbfc4bce2
Auto-generated-cl: translation import
2015-03-23 05:38:24 -07:00
tiger_huang
1263b2f1f2
Prevent unexpected rotation while going back to keyguard
...
The original logic would let the app hidden by keyguard be able to
decide the orientation. While going back from a show-when-locked app
to keyguard, there would be a short time that keyguard is unable to
decide the orientation, which causes WMS uses the wrong orientation
from the wrong app.
https://code.google.com/p/android/issues/detail?id=155640
Change-Id: Ibc17bfe4603f68b241dc7380459ec9de42a3e259
2015-03-23 05:58:46 +00:00
Griff Hazen
38f75097ff
am 0b42ff79: Merge "Allow emulator to select a window outset bottom" into lmp-mr1-modular-dev
...
* commit '0b42ff7916e6cc32c812a3be8f3e4ebdf96e8553':
Allow emulator to select a window outset bottom
2015-03-22 00:05:48 +00:00
Griff Hazen
0b42ff7916
Merge "Allow emulator to select a window outset bottom" into lmp-mr1-modular-dev
2015-03-21 23:59:46 +00:00
Alan Viverette
19537c0a18
am 38fcaf40: Merge "Move arrow_pointer hotspot to better match actual tip"
...
* commit '38fcaf4037a50225b931551a48c898c7b0bb4db2':
Move arrow_pointer hotspot to better match actual tip
2015-03-21 20:20:48 +00:00
Alan Viverette
38fcaf4037
Merge "Move arrow_pointer hotspot to better match actual tip"
2015-03-21 20:06:57 +00:00
Chad Brubaker
5b11b3d6c5
am 31cee318: Merge "Specify public exponent for RSA"
...
* commit '31cee318f0494e6d77fc55599f285f534435405e':
Specify public exponent for RSA
2015-03-21 19:31:22 +00:00
Chad Brubaker
31cee318f0
Merge "Specify public exponent for RSA"
2015-03-21 19:18:25 +00:00
Geoff Mendal
57d7b5f4ea
am 1f9bad3c: (-s ours) Import translations. DO NOT MERGE
...
* commit '1f9bad3cb98964aaaecc2266102348b85d6fae9a':
Import translations. DO NOT MERGE
2015-03-21 15:34:55 +00:00
Geoff Mendal
1f9bad3cb9
Import translations. DO NOT MERGE
...
Change-Id: I59ad105e99dbd4c8bd19c4e94eecd6e19425345a
Auto-generated-cl: translation import
2015-03-20 23:15:45 -07:00
Jeff Brown
13d81b6dd2
am 619ce1ce: am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev
...
* commit '619ce1ce534775ab0ff4d591a69dafd53c04a315':
Disable more hotkeys while in setup.
2015-03-20 22:35:41 +00:00
Jeff Brown
619ce1ce53
am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev
...
* commit 'd62163055f983b95a954f1a6c2cbc8e0085a7ab5':
Disable more hotkeys while in setup.
2015-03-20 22:10:54 +00:00
Jeff Brown
d62163055f
Merge "Disable more hotkeys while in setup." into lmp-mr1-dev
2015-03-20 22:05:07 +00:00
Chad Brubaker
003a55a671
Specify public exponent for RSA
...
Keymaster no longer adds a default value, so these tests were failing.
Change-Id: I9c5a8d2552534db1d7fa77965b0d675acc3ccc0a
2015-03-20 14:03:49 -07:00
Jeff Brown
38d3feb76c
Disable more hotkeys while in setup.
...
Disables fallback key processing for CALL, CAMERA, and HEADSETHOOK
buttons.
Bug: 19767816
Change-Id: I423103c367e05827c939cd8d8dbecb6012b0e9f0
2015-03-20 13:26:09 -07:00
Alex Klyubin
2110a28a6c
am a4c4c575: Merge "Add android.security.NetworkSecurityPolicy."
...
* commit 'a4c4c575c793d3ba4847107b15ce3a9dd5395878':
Add android.security.NetworkSecurityPolicy.
2015-03-20 18:08:30 +00:00
Alex Klyubin
a4c4c575c7
Merge "Add android.security.NetworkSecurityPolicy."
2015-03-20 17:56:25 +00:00
youngmin0822.lee
c80c9ad188
Don't create unnecessary RenderThread's instance when executing 'dumpsys gfxinfo'
...
To obtain the gfxinfo for each process, the static method of RenderProxy is used, which is named outputLogBuffer().
In there,
1. RenderTask is created for getting DisplayList Commands in RenderNode.
2. staticPostAndWait() is called
3. RenderThread's instance is created by 'RenderThread::getInstance()' in staticPostAndWait()
In case of the service, they don't use HW Acceleration, so don't need RenderThread.
But, by the process of No.3, RenderThread is created for all process.
As we know, RenderThread never be destroyed while the process is alive.
This patch checks RenderThread instance before the creation of RenderTask.
And, there is no one, just return to prevent the unnecessay creation of it.
Change-Id: I4fe29d83c9ced3e8b67177c0874c5d8ee62e1870
2015-03-20 21:22:32 +09:00
Zach Riggle
685d33dd18
am 104a29b6: am a7dbe970: am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
...
* commit '104a29b6b5fe6e454787053ca72950dbbc4d424b':
Fix NPE in FlashlightController
2015-03-19 23:42:58 +00:00
Zach Riggle
104a29b6b5
am a7dbe970: am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
...
* commit 'a7dbe970bc8f6c90b4e68ffd2146f988aca85ac0':
Fix NPE in FlashlightController
2015-03-19 23:35:20 +00:00
Yang Ni
53699ec613
am d3e6428a: Merge "New API methods for Script Group"
...
* commit 'd3e6428aea34ce3297123c63b4dd6223dac5d5a8':
New API methods for Script Group
2015-03-19 23:35:14 +00:00
Zach Riggle
a7dbe970bc
am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
...
* commit '901e400826e76f0eaa9d05cca20c1696bf86db67':
Fix NPE in FlashlightController
2015-03-19 23:29:06 +00:00
Zach Riggle
901e400826
am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
...
* commit 'a6e7a9b50d0866fac57447496e4207d91c68c806':
Fix NPE in FlashlightController
2015-03-19 23:22:10 +00:00
Yang Ni
d3e6428aea
Merge "New API methods for Script Group"
2015-03-19 23:21:28 +00:00
Zach Riggle
a6e7a9b50d
am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
...
* commit '6a5b2110eb0adbf8b9d53cf86a931b6067691f14':
Fix NPE in FlashlightController
2015-03-19 23:15:02 +00:00
Zach Riggle
6a5b2110eb
Merge "Fix NPE in FlashlightController" into lmp-dev
2015-03-19 23:09:33 +00:00
smain@google.com
62c595aaee
am 6784cf99: am 092a7893: am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
...
* commit '6784cf9945e01de63f67ed11a4925fa9879f2073':
add Places API to the Location feature page
2015-03-19 22:55:38 +00:00
smain@google.com
6784cf9945
am 092a7893: am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
...
* commit '092a7893779455ca9d1a0ff34d9ccefb9ae709db':
add Places API to the Location feature page
2015-03-19 22:48:07 +00:00
smain@google.com
092a789377
am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
...
* commit 'd5fdc2870079876cd5d8407773aa73225a12c044':
add Places API to the Location feature page
2015-03-19 22:42:44 +00:00
smain@google.com
d5fdc28700
am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
...
* commit '3bc84b18b74cd14d98c81ea263b3ca49549a590c':
add Places API to the Location feature page
2015-03-19 22:35:16 +00:00
smain@google.com
3bc84b18b7
am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
...
* commit '910ca415587c6b7f7a004cc381c36352c021c12b':
add Places API to the Location feature page
2015-03-19 22:29:09 +00:00
smain@google.com
910ca41558
am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
...
* commit '4b53dc8bae0cc3f84e20765ea35ea3eab0371134':
add Places API to the Location feature page
2015-03-19 22:22:10 +00:00
smain@google.com
4b53dc8bae
Merge "add Places API to the Location feature page" into lmp-docs
2015-03-19 22:16:12 +00:00
Yang Ni
f2ea01717b
am c077ee31: Merge "Added copyright notice and formatted to convention"
...
* commit 'c077ee316e0f6f50ade552f51ae657a08e423eaa':
Added copyright notice and formatted to convention
2015-03-19 21:41:59 +00:00