176281 Commits

Author SHA1 Message Date
Alex Klyubin
edd0e6c098 Merge "Refuse to reuse IV in encryption mode in AndroidKeyStore." 2015-04-08 18:04:39 +00:00
Quddus Chong
0e3547bd44 cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description.
bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e

Change-Id: I48d1e2f8e1f7d94dffac61a274f9c1a2df31a822
2015-04-08 10:59:27 -07:00
Quddus Chong
c736e8cf41 am f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873" into lmp-mr1-dev
* commit 'f0ab39c10b614514ba4a600aa6fd4354253cde73':
  Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873
2015-04-08 17:53:44 +00:00
Alex Klyubin
3283d2d208 Merge "Add BlockMode.GCM constant to AndroidKeyStore API." 2015-04-08 17:51:13 +00:00
Quddus Chong
f0ab39c10b Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873" into lmp-mr1-dev 2015-04-08 17:46:21 +00:00
Alex Klyubin
d1ccb45945 Refuse to reuse IV in encryption mode in AndroidKeyStore.
This makes IV-using Cipher implementations backed by AndroidKeyStore
refuse to be reused. After Cipher.doFinal completes, invoking update
or doFinal will raise an exception. This is to make it harder to
violate the security best practice of not reusing IV in encryption
mode.

Bug: 18088752
Change-Id: I5102f9e8b2ff428254294703e48948ea8576603d
2015-04-08 09:46:16 -07:00
Olawale Ogunwale
8ddc3e26e6 am 393f89f2: Merge "[ActivityManager] Avoid NullPointerException if no crash info"
* commit '393f89f26df724a3da7a21b28925a21fe5fb253f':
  [ActivityManager] Avoid NullPointerException if no crash info
2015-04-08 16:28:52 +00:00
tiger_huang
951e27f344 Prevent windows from freezing screen while timeout
The original logic lets windows be able to freeze screen again (by
setting win.mOrientationChanging=true) after WINDOW_FREEZE_TIMEOUT is
triggered before mInnerFields.mOrientationChangeComplete is set to
true. In this case, we would lose the protection of
WINDOW_FREEZE_TIMEOUT. If the app never finishes drawing the window,
the screen would keep freezing that the user cannot operate the
device.

Change-Id: I45a0a9e4b3f8d5b0b0043229bfa4890236ae8ab2
2015-04-08 16:10:04 +00:00
Olawale Ogunwale
393f89f26d Merge "[ActivityManager] Avoid NullPointerException if no crash info" 2015-04-08 16:07:44 +00:00
Olawale Ogunwale
380415b643 am 1bdbce29: Merge "[ActivityManager] Finish the failed-to-pause activity"
* commit '1bdbce295cd7978e50b5444420ed222ec6c6281c':
  [ActivityManager] Finish the failed-to-pause activity
2015-04-08 13:09:42 +00:00
Olawale Ogunwale
1bdbce295c Merge "[ActivityManager] Finish the failed-to-pause activity" 2015-04-08 12:51:12 +00:00
louis_chang
3d86b88fa7 [ActivityManager] Avoid NullPointerException if no
crash info

Symptom:
This issue happens because the ANR process got killed
(because it crashed) before the ANR dialog dismissed.
In that case, the process record is marked as crashed
(ProcessRecord.crashing = true). When the ANR dialog
dismissed by user, it will cause NullPointerException
when writeToParcel while performing IPC because there
is no crash info (ApplicationErrorReport.crashInfo = null)

Solution:
Check crashinfo before access it

Change-Id: I2995de57684c1e13aab8297f5eea1e82ca3b7ad8
2015-04-08 18:04:11 +08:00
louis_chang
047dfd40fd [ActivityManager] Finish the failed-to-pause activity
Symptom:
In some scenario, the mPausingActivity may be replaced by other
activity. When previous activity paused, the completePausedLocked()
won't be invoked because it is no longer the mPausingActivity. If
the activity is also pending to finish, it would never be done
because the activity kept in PAUSING state. Since the activity's
window also remain visible and is above on Wallpaper, user would
see it when back to home.

Solution:
Finish the failed-to-pause activity if the activity is pending to
finish.

A Real Case:
(1) Screen turn off
(2) The top activity T1 crashed
(3) When finish activity T1, the next top activity T2 will be
    scheduled to resume and pause (due to screen off).
(4) The activity T2 is also set to finishing due to T1 crashed.
(5) Before T2 paused and before paused timeout occurs, there has
    a new process started which brings up the next top activity T3
    to resume and pause. So the pausing activity is now replaced.
(6) When activity T2 paused, it cannot completed the pause operation
    T2 will remain in PAUSING and finishing state with its window
    visible. The process won't be killed because the oomadj stays
    at 1 (Visible).

Change-Id: Ib10fded891b21c774b26a93071c717fa50516e22
2015-04-08 16:35:55 +08:00
Romain Guy
e4d787b277 am 80e455e3: Merge "Prevent possible memory leak in SpanSet"
* commit '80e455e32580fb909af18ad0a21fccc6b433dd4b':
  Prevent possible memory leak in SpanSet
2015-04-08 07:14:35 +00:00
Romain Guy
80e455e325 Merge "Prevent possible memory leak in SpanSet" 2015-04-08 06:56:26 +00:00
Eric Gilmore
1fb61c4688 am b1044aaf: am 8ba1380f: am a4f72eb0: am aac938a8: Merge "Fixing date." into lmp-docs
* commit 'b1044aaf29227b2075e08098b6f5ed5eaf7cf2c0':
  Fixing date.
2015-04-08 01:29:10 +00:00
Eric Gilmore
b1044aaf29 am 8ba1380f: am a4f72eb0: am aac938a8: Merge "Fixing date." into lmp-docs
* commit '8ba1380fb59d3b7adec7e99f354eccabcead65b6':
  Fixing date.
2015-04-08 00:53:50 +00:00
Eric Gilmore
8ba1380fb5 am a4f72eb0: am aac938a8: Merge "Fixing date." into lmp-docs
* commit 'a4f72eb079938bed57e8183e8110da044fe03429':
  Fixing date.
2015-04-08 00:43:41 +00:00
Eric Gilmore
a4f72eb079 am aac938a8: Merge "Fixing date." into lmp-docs
* commit 'aac938a8597efb8d71ce7dc124779f1d268510eb':
  Fixing date.
2015-04-08 00:33:07 +00:00
Eric Gilmore
aac938a859 Merge "Fixing date." into lmp-docs 2015-04-08 00:05:28 +00:00
Jim Miller
e2e945a887 am 40c4021a: Merge "third part apps can disable the secret lockscreen"
* commit '40c4021a70c56bcc4d6f6569d795dff52ab4e369':
  third part apps can disable the secret lockscreen
2015-04-07 22:58:53 +00:00
Jim Miller
40c4021a70 Merge "third part apps can disable the secret lockscreen" 2015-04-07 22:41:19 +00:00
Alex Klyubin
38bb642bbb Add BlockMode.GCM constant to AndroidKeyStore API.
GCM mode is not yet implemented. This is just adding a constant to
KeyStoreKeyConstraints.BlockMode.

Bug: 18088752
Change-Id: Ibba5b393f56ab9f6bb96d994f110687ab8d65ff3
2015-04-07 15:09:12 -07:00
Adam Powell
da1bc60574 am 7a3c8c70: Merge "Fixed memory leak in ExtractEditLayout finish()"
* commit '7a3c8c70a6c745aa2559a7f769528774021b62a6':
  Fixed memory leak in ExtractEditLayout finish()
2015-04-07 21:23:58 +00:00
Adam Powell
947b5029e5 am 8391e03b: Merge "ProgressBar: Fix error of process bar cannot update on some condition."
* commit '8391e03b7ef20f22ffc31da43e01b2fb8d1ec00a':
  ProgressBar: Fix error of process bar cannot update on some condition.
2015-04-07 21:23:50 +00:00
Quddus Chong
ef2f390fa6 am 4559d6ae: am 90bf99b1: am 922946ea: am a0c887c6: docs: Fixed typo in Implementing In-app Billing guide. bug: 19961296
* commit '4559d6aefb928edc68da5d0ed301db37bd8b30b7':
  docs: Fixed typo in Implementing In-app Billing guide. bug: 19961296
2015-04-07 21:18:23 +00:00
Quddus Chong
d8cf94d7da am 0c7f9436: am 47c1835a: am 868c795d: am 0307acf9: Merge "docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. bug: 20077293" into lmp-docs
* commit '0c7f94365c732ea6d1a4c383ed68005c0e67a619':
  docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. bug: 20077293
2015-04-07 21:18:03 +00:00
Joe Fernandez
617181bcfa am 2e567682: am 038fe2de: am 19a57761: am 95c39774: docs: Small fix for Android Dashboard
* commit '2e567682a2802170a3f5fd7f621296178a397541':
  docs: Small fix for Android Dashboard
2015-04-07 21:17:55 +00:00
Joe Fernandez
f545618fd2 am 5861b5b6: am 911e4c50: am ab882856: am b1a6bd01: docs: April 2015 Android Dashboard update
* commit '5861b5b618cf891ae490c1832f15b101e6b4a090':
  docs: April 2015 Android Dashboard update
2015-04-07 21:17:49 +00:00
Tim Murray
d782c57d37 am 5352411a: Merge "Move cache dir to its own class."
* commit '5352411a8c41dd1c3c51a28cdd0b09f42e246b33':
  Move cache dir to its own class.
2015-04-07 20:59:39 +00:00
Adam Powell
7a3c8c70a6 Merge "Fixed memory leak in ExtractEditLayout finish()" 2015-04-07 20:56:49 +00:00
Adam Powell
8391e03b7e Merge "ProgressBar: Fix error of process bar cannot update on some condition." 2015-04-07 20:56:36 +00:00
Tim Murray
5352411a8c Merge "Move cache dir to its own class." 2015-04-07 20:34:21 +00:00
Tim Murray
e1e6c66198 Move cache dir to its own class.
This prevents us from loading the RS static initializer all the time.

Change-Id: I8cea7540e50251aba8c2f199f06f344f991e7d7f
2015-04-07 13:24:14 -07:00
Quddus Chong
a9f6a9b769 Fixed broken link in UiAutomation.setRunAsMonkey() method description.
bug: 19711873

Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e
2015-04-07 13:04:39 -07:00
Quddus Chong
4559d6aefb am 90bf99b1: am 922946ea: am a0c887c6: docs: Fixed typo in Implementing In-app Billing guide. bug: 19961296
* commit '90bf99b163866020140ac872aa704163fafddae1':
  docs: Fixed typo in Implementing In-app Billing guide. bug: 19961296
2015-04-07 19:19:48 +00:00
Quddus Chong
90bf99b163 am 922946ea: am a0c887c6: docs: Fixed typo in Implementing In-app Billing guide. bug: 19961296
* commit '922946ea75e0b387d900bb20c55759c6343ac4b5':
  docs: Fixed typo in Implementing In-app Billing guide. bug: 19961296
2015-04-07 19:09:13 +00:00
Quddus Chong
0c7f94365c am 47c1835a: am 868c795d: am 0307acf9: Merge "docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. bug: 20077293" into lmp-docs
* commit '47c1835a45321cc327dfd9fc97b3d22305d3fa5e':
  docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. bug: 20077293
2015-04-07 19:03:01 +00:00
Eric Gilmore
4480bdad95 Fixing date.
Change-Id: Ia406bec97cda0ae309abbb8c538ad4ea3b4e9d42
2015-04-07 11:58:52 -07:00
Quddus Chong
922946ea75 am a0c887c6: docs: Fixed typo in Implementing In-app Billing guide. bug: 19961296
* commit 'a0c887c67e5d925247fcb77d714ccc3383c0d0da':
  docs: Fixed typo in Implementing In-app Billing guide. bug: 19961296
2015-04-07 18:58:07 +00:00
Joe Fernandez
2e567682a2 am 038fe2de: am 19a57761: am 95c39774: docs: Small fix for Android Dashboard
* commit '038fe2deab06ff4fb72db1f5d5012ddf35c5d04d':
  docs: Small fix for Android Dashboard
2015-04-07 18:53:01 +00:00
Quddus Chong
47c1835a45 am 868c795d: am 0307acf9: Merge "docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. bug: 20077293" into lmp-docs
* commit '868c795dd253ff31999962f84299be27e4d5828f':
  docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. bug: 20077293
2015-04-07 18:51:22 +00:00
Quddus Chong
a0c887c67e docs: Fixed typo in Implementing In-app Billing guide.
bug: 19961296

Change-Id: If170b58feb6d7160790591b540cdb91d7c23d6e5
2015-04-07 11:48:30 -07:00
David Friedman
1adf4958e8 New build rule reflecting different masthead, side nav for NDK minisite.
Change-Id: I81b50cca405d907cf8a6514356b92e38b6808d3c
2015-04-07 11:45:54 -07:00
Joe Fernandez
5861b5b618 am 911e4c50: am ab882856: am b1a6bd01: docs: April 2015 Android Dashboard update
* commit '911e4c508ca3061bbf8d13e78350636f1b3ef52e':
  docs: April 2015 Android Dashboard update
2015-04-07 18:41:32 +00:00
Quddus Chong
868c795dd2 am 0307acf9: Merge "docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. bug: 20077293" into lmp-docs
* commit '0307acf90773a16faa6b33dad12b14b95708a3cc':
  docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. bug: 20077293
2015-04-07 18:40:32 +00:00
Joe Fernandez
038fe2deab am 19a57761: am 95c39774: docs: Small fix for Android Dashboard
* commit '19a57761b4aec17c907d271e58ae4c20da40a039':
  docs: Small fix for Android Dashboard
2015-04-07 18:40:22 +00:00
Quddus Chong
0307acf907 Merge "docs: Removed instruction to add gms version in manifest during Google Play services setup, since Android Studio automatically handles this. bug: 20077293" into lmp-docs 2015-04-07 18:31:45 +00:00
Joe Fernandez
911e4c508c am ab882856: am b1a6bd01: docs: April 2015 Android Dashboard update
* commit 'ab8828564c5a121ce341710b362bb8f090995885':
  docs: April 2015 Android Dashboard update
2015-04-07 18:31:12 +00:00
Joe Fernandez
19a57761b4 am 95c39774: docs: Small fix for Android Dashboard
* commit '95c39774d245921be04b2a6f0f221f86545f8ac6':
  docs: Small fix for Android Dashboard
2015-04-07 18:31:03 +00:00