OSDN Git Service
Robert Greenwalt [Mon, 6 Apr 2015 17:54:18 +0000 (17:54 +0000)]
am
069f4cbc: Merge "Fix memory leak in Connectivity Service when phone app crashes"
* commit '
069f4cbccb651d98e4c50eca4698624ea089804d':
Fix memory leak in Connectivity Service when phone app crashes
Robert Greenwalt [Mon, 6 Apr 2015 17:34:48 +0000 (17:34 +0000)]
Merge "Fix memory leak in Connectivity Service when phone app crashes"
Olawale Ogunwale [Mon, 6 Apr 2015 15:44:31 +0000 (15:44 +0000)]
am
47c1cf4b: Merge "[ActivityManager] Fix ServiceRecord leakage"
* commit '
47c1cf4b35616059409a0674382c2318494e877b':
[ActivityManager] Fix ServiceRecord leakage
Olawale Ogunwale [Mon, 6 Apr 2015 15:44:24 +0000 (15:44 +0000)]
am
655ef081: Merge "[ActivityManager] Examine bad process before clean up application record"
* commit '
655ef08144ec0b71a98b6b3a38e50c6b346ae467':
[ActivityManager] Examine bad process before clean up application record
Olawale Ogunwale [Mon, 6 Apr 2015 15:44:08 +0000 (15:44 +0000)]
am
baedbfbb: Merge "[ProcessStas] fix index out of bounds when add duration."
* commit '
baedbfbbb1181829bcffb1be3732b6f26a315bd8':
[ProcessStas] fix index out of bounds when add duration.
Olawale Ogunwale [Mon, 6 Apr 2015 15:25:03 +0000 (15:25 +0000)]
Merge "[ActivityManager] Fix ServiceRecord leakage"
Olawale Ogunwale [Mon, 6 Apr 2015 15:24:40 +0000 (15:24 +0000)]
Merge "[ActivityManager] Examine bad process before clean up application record"
Olawale Ogunwale [Mon, 6 Apr 2015 15:23:29 +0000 (15:23 +0000)]
Merge "[ProcessStas] fix index out of bounds when add duration."
Olawale Ogunwale [Sat, 4 Apr 2015 16:29:32 +0000 (16:29 +0000)]
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
Maunik Shah [Mon, 30 Mar 2015 06:06:42 +0000 (11:36 +0530)]
Fix memory leak in Connectivity Service when phone app crashes
Upon crash of com.android.phone process, NetworkFactoryInfo is
not getting removed from HashMap and will get accumulated on
every start of the process.
Change-Id: Iafde28daddfc82728c03208522682b1efc85a121
Olawale Ogunwale [Sat, 4 Apr 2015 16:12:39 +0000 (16:12 +0000)]
Merge "Remove the window whose client process has died or become zombie"
Geoff Mendal [Sat, 4 Apr 2015 05:45:10 +0000 (05:45 +0000)]
am
bad1356b: (-s ours) Import translations. DO NOT MERGE
* commit '
bad1356b2d2a229c57160af77aab78be5d3adb49':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 4 Apr 2015 05:32:08 +0000 (22:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie0d2764cd9e3289d56cc994a2a45f6f67b5ed1e6
Auto-generated-cl: translation import
Andreas Gampe [Sat, 4 Apr 2015 04:41:06 +0000 (04:41 +0000)]
am
f8cb672f: Merge "Frameworks/base: Pass variant and feature-set to runtime"
* commit '
f8cb672f121495e4f80b96a14140180f71e770fe':
Frameworks/base: Pass variant and feature-set to runtime
Andreas Gampe [Sat, 4 Apr 2015 04:23:11 +0000 (04:23 +0000)]
Merge "Frameworks/base: Pass variant and feature-set to runtime"
Quddus Chong [Sat, 4 Apr 2015 00:59:39 +0000 (00:59 +0000)]
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.
Quddus Chong [Sat, 4 Apr 2015 00:49:49 +0000 (00:49 +0000)]
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.
Quddus Chong [Sat, 4 Apr 2015 00:39:10 +0000 (00:39 +0000)]
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.
Quddus Chong [Sat, 4 Apr 2015 00:29:11 +0000 (00:29 +0000)]
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.
Quddus Chong [Sat, 4 Apr 2015 00:06:28 +0000 (17:06 -0700)]
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
Andreas Gampe [Fri, 3 Apr 2015 06:12:56 +0000 (23:12 -0700)]
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
Luan Nguyen [Fri, 3 Apr 2015 22:28:45 +0000 (22:28 +0000)]
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.
Luan Nguyen [Fri, 3 Apr 2015 22:11:14 +0000 (22:11 +0000)]
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.
Luan Nguyen [Fri, 3 Apr 2015 22:01:12 +0000 (22:01 +0000)]
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.
Luan Nguyen [Fri, 3 Apr 2015 21:49:32 +0000 (21:49 +0000)]
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.
Luan Nguyen [Fri, 3 Apr 2015 21:40:52 +0000 (21:40 +0000)]
Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
Quddus Chong [Fri, 3 Apr 2015 21:29:44 +0000 (21:29 +0000)]
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).
Quddus Chong [Fri, 3 Apr 2015 21:19:15 +0000 (21:19 +0000)]
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).
Quddus Chong [Fri, 3 Apr 2015 21:08:49 +0000 (21:08 +0000)]
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).
Joe LaPenna [Fri, 3 Apr 2015 21:03:33 +0000 (21:03 +0000)]
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.
Quddus Chong [Fri, 3 Apr 2015 20:57:44 +0000 (20:57 +0000)]
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).
Joe LaPenna [Fri, 3 Apr 2015 20:55:00 +0000 (20:55 +0000)]
Merge "Make burn in protection updates happen on the minute." into lmp-mr1-modular-dev
Quddus Chong [Fri, 3 Apr 2015 20:47:45 +0000 (20:47 +0000)]
Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
Elliott Hughes [Fri, 3 Apr 2015 20:40:52 +0000 (20:40 +0000)]
am
efcbaec1: Merge "Only Windows doesn\'t have %zd."
* commit '
efcbaec14135c42f81e2a8f645584cf7cf542a02':
Only Windows doesn't have %zd.
Elliott Hughes [Fri, 3 Apr 2015 20:16:21 +0000 (20:16 +0000)]
Merge "Only Windows doesn't have %zd."
Alex Klyubin [Fri, 3 Apr 2015 20:10:36 +0000 (20:10 +0000)]
am
64b0062a: Merge "Load fewer classes when AndroidKeyStore provider is installed."
* commit '
64b0062a373102f83837faade20b469685758139':
Load fewer classes when AndroidKeyStore provider is installed.
Elliott Hughes [Fri, 3 Apr 2015 19:56:45 +0000 (12:56 -0700)]
Only Windows doesn't have %zd.
Change-Id: I0e4b0fdc61641c5ecb724fd096bd2315dcf8ed4a
Alex Klyubin [Fri, 3 Apr 2015 19:47:17 +0000 (19:47 +0000)]
Merge "Load fewer classes when AndroidKeyStore provider is installed."
Alex Klyubin [Fri, 3 Apr 2015 19:32:39 +0000 (12:32 -0700)]
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
Alex Klyubin [Fri, 3 Apr 2015 19:33:27 +0000 (19:33 +0000)]
am
08963653: Merge "Rename KeymasterException to KeyStoreException."
* commit '
08963653fc9434d2f50d3c8e64c757138efd102e':
Rename KeymasterException to KeyStoreException.
Chad Brubaker [Fri, 3 Apr 2015 19:33:21 +0000 (19:33 +0000)]
am
377885e1: Merge "Mark all test keys as no auth required"
* commit '
377885e1e6a4efc727060cca241fea29114315d5':
Mark all test keys as no auth required
Alex Klyubin [Fri, 3 Apr 2015 19:33:14 +0000 (19:33 +0000)]
am
b292e49b: Merge "Obtain SPI without using Reflection."
* commit '
b292e49b32fa321e59bf88c68e4c4d8c139645dd':
Obtain SPI without using Reflection.
Alex Klyubin [Fri, 3 Apr 2015 19:13:49 +0000 (19:13 +0000)]
Merge "Rename KeymasterException to KeyStoreException."
Chad Brubaker [Fri, 3 Apr 2015 19:13:18 +0000 (19:13 +0000)]
Merge "Mark all test keys as no auth required"
Alex Klyubin [Fri, 3 Apr 2015 19:13:15 +0000 (19:13 +0000)]
Merge "Obtain SPI without using Reflection."
Alex Klyubin [Fri, 3 Apr 2015 16:44:39 +0000 (09:44 -0700)]
Obtain SPI without using Reflection.
Bug:
18088752
Change-Id: I76d42e17f5f28af6fd9a96ee812d286f6c6a085b
Miao Wang [Fri, 3 Apr 2015 17:55:42 +0000 (17:55 +0000)]
am
6aed9ec1: Merge "[RenderScript] update exception reporting for copyTo() after autoPadding added."
* commit '
6aed9ec1b85ff1a8a39c4ec091a017f79413ead0':
[RenderScript] update exception reporting for copyTo() after autoPadding added.
Miao Wang [Fri, 3 Apr 2015 17:38:13 +0000 (17:38 +0000)]
Merge "[RenderScript] update exception reporting for copyTo() after autoPadding added."
Miao Wang [Fri, 3 Apr 2015 16:15:39 +0000 (09:15 -0700)]
[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
Wale Ogunwale [Fri, 3 Apr 2015 00:36:56 +0000 (00:36 +0000)]
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
Wale Ogunwale [Fri, 3 Apr 2015 00:26:49 +0000 (00:26 +0000)]
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
Wale Ogunwale [Fri, 3 Apr 2015 00:15:26 +0000 (00:15 +0000)]
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
Wale Ogunwale [Fri, 3 Apr 2015 00:07:03 +0000 (00:07 +0000)]
Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev
Wale Ogunwale [Thu, 2 Apr 2015 23:13:57 +0000 (16:13 -0700)]
[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
Fyodor Kupolov [Thu, 2 Apr 2015 23:27:38 +0000 (23:27 +0000)]
am
3d8b7f4d: Merge "Support for storing OAT files in app directory"
* commit '
3d8b7f4d50c2f7c64ec4e5874fd95cf837ddc12e':
Support for storing OAT files in app directory
Filip Gruszczynski [Thu, 2 Apr 2015 21:35:58 +0000 (14:35 -0700)]
Make burn in protection updates happen on the minute.
Bug:
20052872
Change-Id: Iff7e081a9ae99b457024537b8c64b7c2572b6172
Fyodor Kupolov [Thu, 2 Apr 2015 23:11:10 +0000 (23:11 +0000)]
Merge "Support for storing OAT files in app directory"
Simon Wilson [Thu, 2 Apr 2015 23:04:25 +0000 (23:04 +0000)]
am
fb397cf8: (-s ours) Merge "Frameworks/base: Support dex2oat threads system property" into lmp-mr1-modular-dev
* commit '
fb397cf827d2f0c2e1a2aca496c75752da11bc3f':
Frameworks/base: Support dex2oat threads system property
Alex Klyubin [Thu, 2 Apr 2015 22:53:46 +0000 (15:53 -0700)]
Rename KeymasterException to KeyStoreException.
The code in question talks to KeyStore which returns error codes
which are a mix of keystore and keymaster error codes. To better
match the layering of KeyStore on top of keystore and keymaster,
this CL renames KeymasterException into KeyStoreException. It also
adds human-readable error messages to exceptions raised by keystore
rather than keymaster (e.g., key not found).
Bug:
18088752
Change-Id: I4cd1235e16518c9f2e8c5557a457774c6e687b88
Chad Brubaker [Thu, 2 Apr 2015 21:41:37 +0000 (14:41 -0700)]
Mark all test keys as no auth required
Now that auth token checks are in keystore keys without any auth tags
are invalid.
Also adds a test to check that a key with auth required fails when none
is present.
Change-Id: I0d5d44d70a849978e9b2e809675b8343c6650ff2
Alex Klyubin [Thu, 2 Apr 2015 21:25:56 +0000 (21:25 +0000)]
am
3cc9e5d6: Merge "Improve the AndroidKeyStore-backed HMAC state machine."
* commit '
3cc9e5d68d89ea1ffa79ad6981585bc46362c4a7':
Improve the AndroidKeyStore-backed HMAC state machine.
Alex Klyubin [Thu, 2 Apr 2015 21:25:50 +0000 (21:25 +0000)]
am
9635a56a: Merge "Expose new key use constraints in KeyPairGeneratorSpec."
* commit '
9635a56acfe3318d9ae5020727090a2dc8c118d0':
Expose new key use constraints in KeyPairGeneratorSpec.
Alex Klyubin [Thu, 2 Apr 2015 21:06:27 +0000 (21:06 +0000)]
Merge "Improve the AndroidKeyStore-backed HMAC state machine."
Alex Klyubin [Thu, 2 Apr 2015 21:03:11 +0000 (21:03 +0000)]
Merge "Expose new key use constraints in KeyPairGeneratorSpec."
Simon Wilson [Thu, 2 Apr 2015 20:57:52 +0000 (20:57 +0000)]
Merge "Frameworks/base: Support dex2oat threads system property" into lmp-mr1-modular-dev
Alex Klyubin [Thu, 2 Apr 2015 20:42:59 +0000 (20:42 +0000)]
am
d2eec1a7: Merge "Add exception types for AndroidKeyStore key validity issues."
* commit '
d2eec1a7865dd552114b330fce1a1472a9e08806':
Add exception types for AndroidKeyStore key validity issues.
Alex Klyubin [Thu, 2 Apr 2015 20:24:47 +0000 (20:24 +0000)]
Merge "Add exception types for AndroidKeyStore key validity issues."
Andrew Solovay [Thu, 2 Apr 2015 20:19:15 +0000 (20:19 +0000)]
am
f99a16c9: am
589a272e: am
f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs
* commit '
f99a16c943a4366bdfdba19534457f9e45538f7d':
docs: Fixed formatting in android:documentLaunchMode syntax section
Yuichi Araki [Thu, 2 Apr 2015 20:19:09 +0000 (20:19 +0000)]
am
e2fc3adb: am
61ce6c9b: am
776cf41d: Fix a broken link in javadoc
* commit '
e2fc3adbb4040400496aebdab80c4cac1083da27':
Fix a broken link in javadoc
Andrew Solovay [Thu, 2 Apr 2015 20:10:55 +0000 (20:10 +0000)]
am
589a272e: am
f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs
* commit '
589a272e97d1f24abee1bdfce18ab88cbd5f12a9':
docs: Fixed formatting in android:documentLaunchMode syntax section
Yuichi Araki [Thu, 2 Apr 2015 20:10:48 +0000 (20:10 +0000)]
am
61ce6c9b: am
776cf41d: Fix a broken link in javadoc
* commit '
61ce6c9b705e41800662b33601c01a4848c174d3':
Fix a broken link in javadoc
Andrew Solovay [Thu, 2 Apr 2015 19:56:41 +0000 (19:56 +0000)]
am
f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs
* commit '
f2ff12ba00ba7c290bc15ea28fdcf3c6d6d1029a':
docs: Fixed formatting in android:documentLaunchMode syntax section
Yuichi Araki [Thu, 2 Apr 2015 19:56:35 +0000 (19:56 +0000)]
am
776cf41d: Fix a broken link in javadoc
* commit '
776cf41d7c8f239d20397886f2120407396cfc87':
Fix a broken link in javadoc
Andrew Solovay [Thu, 2 Apr 2015 19:25:24 +0000 (19:25 +0000)]
Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs
Alex Klyubin [Thu, 2 Apr 2015 16:58:08 +0000 (09:58 -0700)]
Expose new key use constraints in KeyPairGeneratorSpec.
The constraints are currently ignored.
Bug:
18088752
Change-Id: Iabd2018200afb2bf8ac1748d1def47af74bfb9d3
Olawale Ogunwale [Thu, 2 Apr 2015 17:00:12 +0000 (17:00 +0000)]
am
e4d4e22f: Merge "[ActivityManager] Avoid improper resume top activity."
* commit '
e4d4e22f26bfd36a553fb24232d2fd4ddf4fc907':
[ActivityManager] Avoid improper resume top activity.
Olawale Ogunwale [Thu, 2 Apr 2015 16:39:18 +0000 (16:39 +0000)]
Merge "[ActivityManager] Avoid improper resume top activity."
riddle_hsu [Thu, 2 Apr 2015 08:43:13 +0000 (16:43 +0800)]
[ActivityManager] Avoid improper resume top activity.
When there is a process died, only resume top if
it contains visible activity.
This can fix case 1 in
https://android-review.googlesource.com/#/c/120901/
Change-Id: I45584e76f9e863980d04bbb593d7d26a8900acd0
tiger_huang [Fri, 11 Jul 2014 10:41:48 +0000 (18:41 +0800)]
Remove the window whose client process has died or become zombie
Window Manager Service would fail to report window-resized to the
process which has become zombie. This would cause the window to
freeze screen continuously. In this case, we assume the process has
died and remove its window to recycle resources and to prevent it from
freezing the screen.
Change-Id: Ic7384731bf9a1fa8b9602d4f1dbee7492db126c5
Yuichi Araki [Fri, 20 Mar 2015 09:01:02 +0000 (18:01 +0900)]
Fix a broken link in javadoc
Bug:
19856130
Change-Id: I0456e951f8bed36e3a62ddfd882f9c2d2bef9627
Eric Gilmore [Thu, 2 Apr 2015 01:31:30 +0000 (01:31 +0000)]
am
7278d89c: am
f2204720: am
b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
* commit '
7278d89c1b51bc937e79021eae523dfd0f3d30a1':
Changing wording to reflect c2dm shutdown.
Elliott Hughes [Thu, 2 Apr 2015 01:13:09 +0000 (01:13 +0000)]
am
64c8a073: Merge "Early return in RemoteViewsAdapter is too late"
* commit '
64c8a07345cb7cb01b3e98442b52c51d473fbf2d':
Early return in RemoteViewsAdapter is too late
Eric Gilmore [Thu, 2 Apr 2015 01:06:52 +0000 (01:06 +0000)]
am
f2204720: am
b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
* commit '
f2204720eac6fd959eb5a3732c0084636bc16095':
Changing wording to reflect c2dm shutdown.
Eric Gilmore [Thu, 2 Apr 2015 00:59:34 +0000 (00:59 +0000)]
am
b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
* commit '
b2b93762b8165ee47f49765816fc7ba0428c371c':
Changing wording to reflect c2dm shutdown.
Elliott Hughes [Wed, 1 Apr 2015 23:34:24 +0000 (23:34 +0000)]
Merge "Early return in RemoteViewsAdapter is too late"
Alex Klyubin [Wed, 1 Apr 2015 23:22:00 +0000 (16:22 -0700)]
Add exception types for AndroidKeyStore key validity issues.
Bug:
18088752
Change-Id: I7494cb6a793e2b57bb849a4253bba2803778c161
Eric Gilmore [Wed, 1 Apr 2015 23:13:25 +0000 (23:13 +0000)]
Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
Alex Klyubin [Wed, 1 Apr 2015 23:03:03 +0000 (16:03 -0700)]
Improve the AndroidKeyStore-backed HMAC state machine.
This defers the start of a new KeyStore operation after Mac.doFinal
until the next Mac.update or .doFinal. Previously, the a new KeyStore
operation was started immediately, at the end of doFinal.
Bug:
18088752
Change-Id: I2d594067ef261f519631d09f7a6087b715801656
Quddus Chong [Thu, 5 Mar 2015 21:16:24 +0000 (13:16 -0800)]
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
Change-Id: I421a29c90a0763665fd93aa85e86d2c6f33ad894
Scott Rowe [Wed, 1 Apr 2015 21:46:45 +0000 (21:46 +0000)]
am
5f78af44: am
a03245a3: am
4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs
* commit '
5f78af44bd9627dace7db4ce47fdf61cf8d78b42':
docs: Building Live TV Apps
Scott Rowe [Wed, 1 Apr 2015 21:35:39 +0000 (21:35 +0000)]
am
a03245a3: am
4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs
* commit '
a03245a343fe7906e4459b6a4dfcc41f60c56fd6':
docs: Building Live TV Apps
Scott Rowe [Wed, 1 Apr 2015 21:25:53 +0000 (21:25 +0000)]
am
4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs
* commit '
4fc3d3ff404c777e07616b704c68176d9060c4e4':
docs: Building Live TV Apps
Scott Rowe [Wed, 1 Apr 2015 21:05:41 +0000 (21:05 +0000)]
Merge "docs: Building Live TV Apps" into lmp-docs
Alex Klyubin [Wed, 1 Apr 2015 20:38:07 +0000 (20:38 +0000)]
am
97467d82: Merge "Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString."
* commit '
97467d82a31964e36cb6bc32ac4cf00e884c190e':
Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString.
Alex Klyubin [Wed, 1 Apr 2015 20:21:00 +0000 (20:21 +0000)]
am
04047af6: Merge "Use Keymaster-friendly validity dates."
* commit '
04047af628338aa7859ae1f24700e1e4e3ae63e7':
Use Keymaster-friendly validity dates.
Alex Klyubin [Wed, 1 Apr 2015 20:15:52 +0000 (20:15 +0000)]
Merge "Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString."
Andreas Gampe [Wed, 1 Apr 2015 20:10:22 +0000 (20:10 +0000)]
am
e816f917: Merge "Frameworks/base: Use system property for cache prune counter"
* commit '
e816f917e0e1c21c8019436744284630f2408dc0':
Frameworks/base: Use system property for cache prune counter
Alex Klyubin [Wed, 1 Apr 2015 17:59:29 +0000 (10:59 -0700)]
Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString.
This makes the hidden API android.net.Uri.toSafeString omit most parts
of HTTP, HTTPS, and FTP URLs to avoid leaking anything unsafe. Only
the host and port are retained for these URLs.
Bug:
19215516
Change-Id: I2e9e33d9afaa9de5dd07a40532d56f0a2179f62a
Luan Nguyen [Wed, 1 Apr 2015 20:05:17 +0000 (20:05 +0000)]
am
d7fe75d6: am
92aa846d: am
d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs
* commit '
d7fe75d687935060557920ff2e515b7246958405':
docs: Update ambient mode to mention disabling bitmap filtering
Luan Nguyen [Wed, 1 Apr 2015 20:05:11 +0000 (20:05 +0000)]
am
13803e43: am
03bafac7: am
649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs
* commit '
13803e43b3196378d26fac8104d211b1224cb9f1':
docs: Remove misleading information about hardware layer performance benefits for optimizing views.