Alex Klyubin
e7e705d494
am acee5b2b: am 9635a56a: Merge "Expose new key use constraints in KeyPairGeneratorSpec."
...
* commit 'acee5b2b4902479fabfb557aba745d352d49ce1a':
Expose new key use constraints in KeyPairGeneratorSpec.
2015-04-02 21:34:48 +00:00
Alex Klyubin
378df98eab
am 3cc9e5d6: Merge "Improve the AndroidKeyStore-backed HMAC state machine."
...
* commit '3cc9e5d68d89ea1ffa79ad6981585bc46362c4a7':
Improve the AndroidKeyStore-backed HMAC state machine.
2015-04-02 21:25:56 +00:00
Alex Klyubin
acee5b2b49
am 9635a56a: Merge "Expose new key use constraints in KeyPairGeneratorSpec."
...
* commit '9635a56acfe3318d9ae5020727090a2dc8c118d0':
Expose new key use constraints in KeyPairGeneratorSpec.
2015-04-02 21:25:50 +00:00
Jason Sams
37192dcde3
Fix minor blur doc bug
...
Change-Id: I4c129d9d3c93d8a36c887e5c594b4402aca5745e
2015-04-02 14:10:53 -07:00
Alex Klyubin
3cc9e5d68d
Merge "Improve the AndroidKeyStore-backed HMAC state machine."
2015-04-02 21:06:28 +00:00
Alex Klyubin
9635a56acf
Merge "Expose new key use constraints in KeyPairGeneratorSpec."
2015-04-02 21:03:11 +00:00
Simon Wilson
fb397cf827
Merge "Frameworks/base: Support dex2oat threads system property" into lmp-mr1-modular-dev
2015-04-02 20:57:53 +00:00
Alex Klyubin
a44e7fd622
am 957e982c: am d2eec1a7: Merge "Add exception types for AndroidKeyStore key validity issues."
...
* commit '957e982cd5fdbf45817500abf68fe8a0689adc34':
Add exception types for AndroidKeyStore key validity issues.
2015-04-02 20:53:05 +00:00
Alex Klyubin
957e982cd5
am d2eec1a7: Merge "Add exception types for AndroidKeyStore key validity issues."
...
* commit 'd2eec1a7865dd552114b330fce1a1472a9e08806':
Add exception types for AndroidKeyStore key validity issues.
2015-04-02 20:42:59 +00:00
Andrew Solovay
93b3d66587
am 7818f205: am f99a16c9: am 589a272e: am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs
...
* commit '7818f205e5b18d8d7fddcf01736d546cb08bfd62':
docs: Fixed formatting in android:documentLaunchMode syntax section
2015-04-02 20:29:28 +00:00
Yuichi Araki
428c2fa0f8
am c3fbf13d: am e2fc3adb: am 61ce6c9b: am 776cf41d: Fix a broken link in javadoc
...
* commit 'c3fbf13d525a0bcf1202618b197f4160750b54f1':
Fix a broken link in javadoc
2015-04-02 20:29:24 +00:00
Alex Klyubin
d2eec1a786
Merge "Add exception types for AndroidKeyStore key validity issues."
2015-04-02 20:24:48 +00:00
Andrew Solovay
7818f205e5
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
2015-04-02 20:19:15 +00:00
Yuichi Araki
c3fbf13d52
am e2fc3adb: am 61ce6c9b: am 776cf41d: Fix a broken link in javadoc
...
* commit 'e2fc3adbb4040400496aebdab80c4cac1083da27':
Fix a broken link in javadoc
2015-04-02 20:19:09 +00:00
Andrew Solovay
f99a16c943
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
2015-04-02 20:10:55 +00:00
Yuichi Araki
e2fc3adbb4
am 61ce6c9b: am 776cf41d: Fix a broken link in javadoc
...
* commit '61ce6c9b705e41800662b33601c01a4848c174d3':
Fix a broken link in javadoc
2015-04-02 20:10:48 +00:00
Andrew Solovay
589a272e97
am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs
...
* commit 'f2ff12ba00ba7c290bc15ea28fdcf3c6d6d1029a':
docs: Fixed formatting in android:documentLaunchMode syntax section
2015-04-02 19:56:41 +00:00
Yuichi Araki
61ce6c9b70
am 776cf41d: Fix a broken link in javadoc
...
* commit '776cf41d7c8f239d20397886f2120407396cfc87':
Fix a broken link in javadoc
2015-04-02 19:56:35 +00:00
Andrew Solovay
f2ff12ba00
Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs
2015-04-02 19:25:25 +00:00
Olawale Ogunwale
65073b910c
am 9987b6e8: am e4d4e22f: Merge "[ActivityManager] Avoid improper resume top activity."
...
* commit '9987b6e867d862c27cd1339d7fa8135b75d565f1':
[ActivityManager] Avoid improper resume top activity.
2015-04-02 17:10:51 +00:00
Alex Klyubin
855fa31eb5
Expose new key use constraints in KeyPairGeneratorSpec.
...
The constraints are currently ignored.
Bug: 18088752
Change-Id: Iabd2018200afb2bf8ac1748d1def47af74bfb9d3
2015-04-02 10:04:33 -07:00
Olawale Ogunwale
9987b6e867
am e4d4e22f: Merge "[ActivityManager] Avoid improper resume top activity."
...
* commit 'e4d4e22f26bfd36a553fb24232d2fd4ddf4fc907':
[ActivityManager] Avoid improper resume top activity.
2015-04-02 17:00:12 +00:00
Olawale Ogunwale
e4d4e22f26
Merge "[ActivityManager] Avoid improper resume top activity."
2015-04-02 16:39:18 +00:00
riddle_hsu
558e849a77
[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
2015-04-02 16:43:13 +08:00
tiger_huang
950ee77fc7
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
2015-04-02 06:42:18 +00:00
Yuichi Araki
776cf41d7c
Fix a broken link in javadoc
...
Bug: 19856130
Change-Id: I0456e951f8bed36e3a62ddfd882f9c2d2bef9627
2015-04-02 04:03:07 +00:00
Eric Gilmore
82a7e2a8dd
am a16d42cd: am 7278d89c: am f2204720: am b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
...
* commit 'a16d42cd4ff9ed66eda1d9b983058b598e7b60d1':
Changing wording to reflect c2dm shutdown.
2015-04-02 02:33:33 +00:00
Elliott Hughes
095428d262
am d15958f6: am 64c8a073: Merge "Early return in RemoteViewsAdapter is too late"
...
* commit 'd15958f661c8748b811e6b12642321f4e47f2817':
Early return in RemoteViewsAdapter is too late
2015-04-02 02:33:15 +00:00
Eric Gilmore
a16d42cd4f
am 7278d89c: am f2204720: am b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
...
* commit '7278d89c1b51bc937e79021eae523dfd0f3d30a1':
Changing wording to reflect c2dm shutdown.
2015-04-02 01:31:30 +00:00
Elliott Hughes
d15958f661
am 64c8a073: Merge "Early return in RemoteViewsAdapter is too late"
...
* commit '64c8a07345cb7cb01b3e98442b52c51d473fbf2d':
Early return in RemoteViewsAdapter is too late
2015-04-02 01:13:09 +00:00
Eric Gilmore
7278d89c1b
am f2204720: am b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
...
* commit 'f2204720eac6fd959eb5a3732c0084636bc16095':
Changing wording to reflect c2dm shutdown.
2015-04-02 01:06:52 +00:00
Eric Gilmore
f2204720ea
am b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
...
* commit 'b2b93762b8165ee47f49765816fc7ba0428c371c':
Changing wording to reflect c2dm shutdown.
2015-04-02 00:59:34 +00:00
Elliott Hughes
64c8a07345
Merge "Early return in RemoteViewsAdapter is too late"
2015-04-01 23:34:25 +00:00
Alex Klyubin
0b188927f4
Add exception types for AndroidKeyStore key validity issues.
...
Bug: 18088752
Change-Id: I7494cb6a793e2b57bb849a4253bba2803778c161
2015-04-01 16:22:00 -07:00
Eric Gilmore
b2b93762b8
Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
2015-04-01 23:13:26 +00:00
Alex Klyubin
a80eee052d
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
2015-04-01 16:03:03 -07:00
Quddus Chong
7639e730c8
docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
...
Change-Id: I421a29c90a0763665fd93aa85e86d2c6f33ad894
2015-04-01 15:40:45 -07:00
Scott Rowe
bb18c2d4ab
am 0f2f0350: am 5f78af44: am a03245a3: am 4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs
...
* commit '0f2f03506654e6669db64147e9f22340c24629e8':
docs: Building Live TV Apps
2015-04-01 21:58:23 +00:00
Scott Rowe
0f2f035066
am 5f78af44: am a03245a3: am 4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs
...
* commit '5f78af44bd9627dace7db4ce47fdf61cf8d78b42':
docs: Building Live TV Apps
2015-04-01 21:46:45 +00:00
Scott Rowe
5f78af44bd
am a03245a3: am 4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs
...
* commit 'a03245a343fe7906e4459b6a4dfcc41f60c56fd6':
docs: Building Live TV Apps
2015-04-01 21:35:39 +00:00
Scott Rowe
a03245a343
am 4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs
...
* commit '4fc3d3ff404c777e07616b704c68176d9060c4e4':
docs: Building Live TV Apps
2015-04-01 21:25:53 +00:00
Scott Rowe
4fc3d3ff40
Merge "docs: Building Live TV Apps" into lmp-docs
2015-04-01 21:05:42 +00:00
Alex Klyubin
261e7a37df
am 39b99186: am 97467d82: Merge "Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString."
...
* commit '39b9918631061340361b7776ace9b9cd4b25be7c':
Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString.
2015-04-01 20:48:17 +00:00
Alex Klyubin
39b9918631
am 97467d82: Merge "Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString."
...
* commit '97467d82a31964e36cb6bc32ac4cf00e884c190e':
Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString.
2015-04-01 20:38:07 +00:00
Alex Klyubin
66b96b5977
am 78014a78: am 04047af6: Merge "Use Keymaster-friendly validity dates."
...
* commit '78014a78155ad05ca2e0af600c0545377c04bdbd':
Use Keymaster-friendly validity dates.
2015-04-01 20:31:42 +00:00
Alex Klyubin
78014a7815
am 04047af6: Merge "Use Keymaster-friendly validity dates."
...
* commit '04047af628338aa7859ae1f24700e1e4e3ae63e7':
Use Keymaster-friendly validity dates.
2015-04-01 20:21:00 +00:00
Andreas Gampe
844e44c96d
am 7598a248: am e816f917: Merge "Frameworks/base: Use system property for cache prune counter"
...
* commit '7598a248bdbeb58a4b40ad773f39137b0dde1137':
Frameworks/base: Use system property for cache prune counter
2015-04-01 20:15:59 +00:00
Luan Nguyen
51d58c9f21
am e5bc03da: am d7fe75d6: am 92aa846d: am d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs
...
* commit 'e5bc03da07489d603df4e02754e061b37b5978d0':
docs: Update ambient mode to mention disabling bitmap filtering
2015-04-01 20:15:55 +00:00
Alex Klyubin
97467d82a3
Merge "Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString."
2015-04-01 20:15:53 +00:00
Luan Nguyen
fa0842fc24
am 0c50a4f1: am 13803e43: am 03bafac7: am 649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs
...
* commit '0c50a4f15cdd120eae331545888982dccdb7b8aa':
docs: Remove misleading information about hardware layer performance benefits for optimizing views.
2015-04-01 20:15:50 +00:00