Olawale Ogunwale
694a8ef938
am baedbfbb: Merge "[ProcessStas] fix index out of bounds when add duration."
...
* commit 'baedbfbbb1181829bcffb1be3732b6f26a315bd8':
[ProcessStas] fix index out of bounds when add duration.
2015-04-06 15:44:08 +00:00
Olawale Ogunwale
baedbfbbb1
Merge "[ProcessStas] fix index out of bounds when add duration."
2015-04-06 15:23:30 +00:00
Olawale Ogunwale
972099c752
am 1d359daa: Merge "Remove the window whose client process has died or become zombie"
...
* commit '1d359daa607042417d095aaa83b78befc1b5f8a3':
Remove the window whose client process has died or become zombie
2015-04-04 16:29:32 +00:00
Olawale Ogunwale
1d359daa60
Merge "Remove the window whose client process has died or become zombie"
2015-04-04 16:12:40 +00:00
Geoff Mendal
8dda89cae7
am bad1356b: (-s ours) Import translations. DO NOT MERGE
...
* commit 'bad1356b2d2a229c57160af77aab78be5d3adb49':
Import translations. DO NOT MERGE
2015-04-04 05:45:10 +00:00
Geoff Mendal
bad1356b2d
Import translations. DO NOT MERGE
...
Change-Id: Ie0d2764cd9e3289d56cc994a2a45f6f67b5ed1e6
Auto-generated-cl: translation import
2015-04-03 22:32:08 -07:00
Andreas Gampe
a4f39ed91c
am f8cb672f: Merge "Frameworks/base: Pass variant and feature-set to runtime"
...
* commit 'f8cb672f121495e4f80b96a14140180f71e770fe':
Frameworks/base: Pass variant and feature-set to runtime
2015-04-04 04:41:06 +00:00
Andreas Gampe
f8cb672f12
Merge "Frameworks/base: Pass variant and feature-set to runtime"
2015-04-04 04:23:12 +00:00
Quddus Chong
d093ad1af1
am 7abeba63: am 0d53fcad: am d642f829: am 54dee349: docs: Fixed broken urls in the UI testing training main page and revised intro to the \'Testing UI for a Single App\' class.
...
* commit '7abeba63b59b81a4b5d8a3edd1c54cbb037945fc':
docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
2015-04-04 00:59:39 +00:00
Quddus Chong
7abeba63b5
am 0d53fcad: am d642f829: am 54dee349: docs: Fixed broken urls in the UI testing training main page and revised intro to the \'Testing UI for a Single App\' class.
...
* commit '0d53fcadce010d50f815a007d50f0b7f7d3bce4d':
docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
2015-04-04 00:49:49 +00:00
Quddus Chong
0d53fcadce
am d642f829: am 54dee349: docs: Fixed broken urls in the UI testing training main page and revised intro to the \'Testing UI for a Single App\' class.
...
* commit 'd642f8297529b3df96d0f822b062cb8354c90c18':
docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
2015-04-04 00:39:10 +00:00
Quddus Chong
d642f82975
am 54dee349: docs: Fixed broken urls in the UI testing training main page and revised intro to the \'Testing UI for a Single App\' class.
...
* commit '54dee349976eaafe7df3a2bb48e9fce2b964a7f0':
docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
2015-04-04 00:29:11 +00:00
Quddus Chong
54dee34997
docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
...
Change-Id: I0e2a49b639101a7607e8e90cf830d9d449ad6328
2015-04-03 17:17:04 -07:00
Andreas Gampe
605cca1a98
Frameworks/base: Pass variant and feature-set to runtime
...
This is required so we pick up the settings correctly when compiling
the boot image on device, or compile any dex files through a
DexClassLoader.
Bug: 20055104
Change-Id: Ia3ab2e48855060894b36f7fd360fe17b978e45a6
2015-04-03 16:08:20 -07:00
Luan Nguyen
b0c35f80f6
am 31947438: am 9b9bda56: am b7647017: am eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
...
* commit '3194743890db9337412acf77edfc6924ba1dec6e':
docs: Remove note about inablity to submit apps to Google Play.
2015-04-03 22:28:45 +00:00
Luan Nguyen
3194743890
am 9b9bda56: am b7647017: am eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
...
* commit '9b9bda56238feabb07b7f6f0ad93f007c24de25d':
docs: Remove note about inablity to submit apps to Google Play.
2015-04-03 22:11:14 +00:00
Luan Nguyen
9b9bda5623
am b7647017: am eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
...
* commit 'b7647017ddf8f57c7333b5ae3e459639ef0a6a7c':
docs: Remove note about inablity to submit apps to Google Play.
2015-04-03 22:01:12 +00:00
Luan Nguyen
b7647017dd
am eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
...
* commit 'eeb42053df94de88674caf904a96ec987d55e668':
docs: Remove note about inablity to submit apps to Google Play.
2015-04-03 21:49:32 +00:00
Luan Nguyen
eeb42053df
Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
2015-04-03 21:40:53 +00:00
Quddus Chong
ba386b55d6
am f2c2be78: am d9e2c05d: am 0c3b894c: am 91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
...
* commit 'f2c2be78ba26793c05dab7c77c84566265bb6668':
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
2015-04-03 21:29:44 +00:00
Quddus Chong
f2c2be78ba
am d9e2c05d: am 0c3b894c: am 91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
...
* commit 'd9e2c05dbf6c6f418b08a8465f1ed8f051015b41':
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
2015-04-03 21:19:15 +00:00
Quddus Chong
d9e2c05dbf
am 0c3b894c: am 91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
...
* commit '0c3b894c2c18b226f58af98569f21bcb4a593b14':
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
2015-04-03 21:08:49 +00:00
Joe LaPenna
e59f426050
am 1f956e42: Merge "Make burn in protection updates happen on the minute." into lmp-mr1-modular-dev
...
* commit '1f956e424320b22255f293e9b6d7d0b30b19a79f':
Make burn in protection updates happen on the minute.
2015-04-03 21:03:33 +00:00
Quddus Chong
0c3b894c2c
am 91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
...
* commit '91070dc419b9b60843094ecc02f95b38c784208a':
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
2015-04-03 20:57:44 +00:00
Joe LaPenna
1f956e4243
Merge "Make burn in protection updates happen on the minute." into lmp-mr1-modular-dev
2015-04-03 20:55:01 +00:00
Quddus Chong
91070dc419
Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
2015-04-03 20:47:46 +00:00
Elliott Hughes
dbb5f5d6c4
am efcbaec1: Merge "Only Windows doesn\'t have %zd."
...
* commit 'efcbaec14135c42f81e2a8f645584cf7cf542a02':
Only Windows doesn't have %zd.
2015-04-03 20:40:52 +00:00
Elliott Hughes
efcbaec141
Merge "Only Windows doesn't have %zd."
2015-04-03 20:16:24 +00:00
Alex Klyubin
e2e5b88e3a
am 64b0062a: Merge "Load fewer classes when AndroidKeyStore provider is installed."
...
* commit '64b0062a373102f83837faade20b469685758139':
Load fewer classes when AndroidKeyStore provider is installed.
2015-04-03 20:10:36 +00:00
Elliott Hughes
b12f2410c7
Only Windows doesn't have %zd.
...
Change-Id: I0e4b0fdc61641c5ecb724fd096bd2315dcf8ed4a
2015-04-03 12:56:45 -07:00
Alex Klyubin
64b0062a37
Merge "Load fewer classes when AndroidKeyStore provider is installed."
2015-04-03 19:47:17 +00:00
Alex Klyubin
6def5afcbc
Load fewer classes when AndroidKeyStore provider is installed.
...
This avoids loading all AndroidKeyStore crypto SPI classes when the
AndroidKeyStore provider is instantiated and installed. This provider
is installed early on during the initialization of each app. Most apps
don't need these classes loaded.
Bug: 18088752
Change-Id: Ib43c9dd6a7d434b128916e0f9c8652ba61df0d47
2015-04-03 12:45:16 -07:00
Alex Klyubin
376b23e6fd
am 08963653: Merge "Rename KeymasterException to KeyStoreException."
...
* commit '08963653fc9434d2f50d3c8e64c757138efd102e':
Rename KeymasterException to KeyStoreException.
2015-04-03 19:33:27 +00:00
Chad Brubaker
e797eb2eea
am 377885e1: Merge "Mark all test keys as no auth required"
...
* commit '377885e1e6a4efc727060cca241fea29114315d5':
Mark all test keys as no auth required
2015-04-03 19:33:21 +00:00
Alex Klyubin
ec029e5516
am b292e49b: Merge "Obtain SPI without using Reflection."
...
* commit 'b292e49b32fa321e59bf88c68e4c4d8c139645dd':
Obtain SPI without using Reflection.
2015-04-03 19:33:14 +00:00
Alex Klyubin
08963653fc
Merge "Rename KeymasterException to KeyStoreException."
2015-04-03 19:13:49 +00:00
Chad Brubaker
377885e1e6
Merge "Mark all test keys as no auth required"
2015-04-03 19:13:37 +00:00
Alex Klyubin
b292e49b32
Merge "Obtain SPI without using Reflection."
2015-04-03 19:13:18 +00:00
Alex Klyubin
a0f656f9bd
Obtain SPI without using Reflection.
...
Bug: 18088752
Change-Id: I76d42e17f5f28af6fd9a96ee812d286f6c6a085b
2015-04-03 12:09:56 -07:00
Miao Wang
511eb66092
am 6aed9ec1: Merge "[RenderScript] update exception reporting for copyTo() after autoPadding added."
...
* commit '6aed9ec1b85ff1a8a39c4ec091a017f79413ead0':
[RenderScript] update exception reporting for copyTo() after autoPadding added.
2015-04-03 17:55:42 +00:00
Miao Wang
6aed9ec1b8
Merge "[RenderScript] update exception reporting for copyTo() after autoPadding added."
2015-04-03 17:38:14 +00:00
Miao Wang
d9b6328509
[RenderScript] update exception reporting for copyTo() after
...
autoPadding added.
- This CL fixes recent CTS failures about copyPadded after
lmp-mr1-dev changes pushed to aosp.
Change-Id: Ica1f4fd934cd83ca4357ea7e7c82dcc7f844b689
2015-04-03 09:15:39 -07:00
Wale Ogunwale
fce4220b88
am 5fd6b139: am 4a7967ad: am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev
...
* commit '5fd6b139033bcaab52921473ab3998725e157002':
[DO NOT MERGE] Fixed NPE when trying to animate a window without display
2015-04-03 00:36:56 +00:00
Wale Ogunwale
5fd6b13903
am 4a7967ad: am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev
...
* commit '4a7967ad9ac76d8b9d6285bc367c33d1b6c83235':
[DO NOT MERGE] Fixed NPE when trying to animate a window without display
2015-04-03 00:26:49 +00:00
Wale Ogunwale
4a7967ad9a
am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev
...
* commit 'f61aee97adf4e543e82289511c6127bcfa53151c':
[DO NOT MERGE] Fixed NPE when trying to animate a window without display
2015-04-03 00:15:26 +00:00
Wale Ogunwale
f61aee97ad
Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev
2015-04-03 00:07:04 +00:00
Wale Ogunwale
70e12aa123
[DO NOT MERGE] Fixed NPE when trying to animate a window without display
...
In some cases it is possible for the AppToken.allAppWindows list to
get out of sync with the list of windows known to WMS if the client
doesn't call Session.remove(Window). This can lead to an NPE when
the animation threads runs and the display for the window has been
removed.
Bug: 19972099
Change-Id: Ifdf9ff2364b96757bba0539394c4a682f64577c9
2015-04-02 16:38:52 -07:00
Fyodor Kupolov
031898dfd2
am 3d8b7f4d: Merge "Support for storing OAT files in app directory"
...
* commit '3d8b7f4d50c2f7c64ec4e5874fd95cf837ddc12e':
Support for storing OAT files in app directory
2015-04-02 23:27:38 +00:00
Filip Gruszczynski
c069f921d9
Make burn in protection updates happen on the minute.
...
Bug: 20052872
Change-Id: Iff7e081a9ae99b457024537b8c64b7c2572b6172
2015-04-02 16:19:35 -07:00
Fyodor Kupolov
3d8b7f4d50
Merge "Support for storing OAT files in app directory"
2015-04-02 23:11:11 +00:00