188177 Commits

Author SHA1 Message Date
Quddus Chong
b49748cfd3 am 0c5752be: am c736e8cf: am f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873" into lmp-mr1-dev
* commit '0c5752be40a9e7ced5be2659965f3c4ba3c3f4eb':
  Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873
2015-04-08 18:23:52 +00:00
Quddus Chong
ff4c632592 Merge "cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873. Original Change-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e" into lmp-docs 2015-04-08 18:16:58 +00:00
Alex Klyubin
c0d6b7cb75 Merge "Fix typo" 2015-04-08 18:16:38 +00:00
Quddus Chong
0c5752be40 am c736e8cf: am f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873" into lmp-mr1-dev
* commit 'c736e8cf41445e7a32721da617d6d7eacd189703':
  Fixed broken link in UiAutomation.setRunAsMonkey() method description. bug: 19711873
2015-04-08 18:11:55 +00:00
Jorim Jaggi
2a39aef439 Merge "Fix crash when removing draw listener" 2015-04-08 18:11:44 +00:00
Alex Klyubin
6895a549ec Fix typo
Change-Id: I1c47ade98ad3ae41dc55e7bcafcad6901b559c89
2015-04-08 11:08:37 -07:00
Alex Klyubin
edd0e6c098 Merge "Refuse to reuse IV in encryption mode in AndroidKeyStore." 2015-04-08 18:04:39 +00:00
Santos Cordon
2aebb3fec3 Add SIM activation constants to TelephonyManager
Change-Id: I43fe5de4a1137bede4e81f4d51f272ad92dc80d5
2015-04-08 11:04:01 -07:00
Alan Viverette
5696f04590 Avoid double-apply of dialog theme
Some cleanup of comments and code.

Bug: 19924382
Change-Id: I7b1a339259cbaa66fea2ffec38d7dde2b1a9612e
2015-04-08 11:03:32 -07: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
Alan Viverette
ff9f7b9646 Update rating bar assets for Material
Also ensures that ProgressBar doesn't create a tiled drawable when it
doesn't actually need to.

Bug: 19574820
Change-Id: Id3b9b00e05a56055ed4b19def7044a0bf38e8ec1
2015-04-08 10:49:26 -07:00
Jorim Jaggi
74a94059c6 Fix crash when removing draw listener
The same behavior can be achieved by using a predraw listener, which
can be removed while the callback is called, so it doesn't crash.

Change-Id: I3a7138ba49936159dc95b7758c9603366dcf808c
2015-04-08 10:47:22 -07: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
Zhijun He
ce9d6f9c75 ImageReader/Writer: implement opaque format operations
Implement attach/detach for image reader and writer.

Bug: 19872821
Change-Id: Ib45a054c6be0b56b370fa8d709b47b0298ba5ea7
2015-04-08 10:39:29 -07:00
Adrian Roos
a323e3f336 Merge "Relabel emergency button" 2015-04-08 16:58:58 +00:00
Adrian Roos
a41d5a7a35 Relabel emergency button
Bug: 19574098
Change-Id: Iddf96ba2206838712980aea00c9ea304f590c8b3
2015-04-08 18:56:38 +02:00
Olawale Ogunwale
8d86acf6c5 am 81954cf3: am 8ddc3e26: am 393f89f2: Merge "[ActivityManager] Avoid NullPointerException if no crash info"
* commit '81954cf30816a007186fbf3be375feed5a7936cc':
  [ActivityManager] Avoid NullPointerException if no crash info
2015-04-08 16:51:01 +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
81954cf308 am 8ddc3e26: am 393f89f2: Merge "[ActivityManager] Avoid NullPointerException if no crash info"
* commit '8ddc3e26e6534adc6f0cdc5c8b9e6ddc3fe3dd10':
  [ActivityManager] Avoid NullPointerException if no crash info
2015-04-08 16:40:24 +00: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
Geoff Mendal
0c43e55d2d Merge "Import translations. DO NOT MERGE" 2015-04-08 15:41:10 +00:00
Benjamin Franz
f63afe7b33 Merge "Allow disabling the lock screen when multiple users are present" 2015-04-08 15:02:43 +00:00
Geoff Mendal
9043002a9d Import translations. DO NOT MERGE
Change-Id: Id26cdcbd9afee8df2e9f8435383923dcc4d96feb
Auto-generated-cl: translation import
2015-04-08 07:43:35 -07:00
Chet Haase
81b924fcb6 Merge "Animate ActionBar items" 2015-04-08 14:11:38 +00:00
Tomasz Mikolajewski
3a1b164f65 Merge "Use default theme for StandaloneActivity (DocumentsUI)." 2015-04-08 13:33:13 +00:00
Olawale Ogunwale
219af75bce am ce5bdfea: am 380415b6: am 1bdbce29: Merge "[ActivityManager] Finish the failed-to-pause activity"
* commit 'ce5bdfea12657c1705d910a47cc48b65abc81723':
  [ActivityManager] Finish the failed-to-pause activity
2015-04-08 13:30:03 +00:00
Tomasz Mikolajewski
a4583a4d2d Merge "Add StubProvider::isChildDocument()." 2015-04-08 13:28:56 +00:00
Olawale Ogunwale
ce5bdfea12 am 380415b6: am 1bdbce29: Merge "[ActivityManager] Finish the failed-to-pause activity"
* commit '380415b6431adeb8138bc328a926807b8ae41df9':
  [ActivityManager] Finish the failed-to-pause activity
2015-04-08 13:19:02 +00:00
Geoff Mendal
8772936e5e Merge "Import translations. DO NOT MERGE" 2015-04-08 13:18:41 +00:00
Geoff Mendal
ec232e3621 Import translations. DO NOT MERGE
Change-Id: I2e860f32f21ae0449ca98dda3519e4733d2d614e
Auto-generated-cl: translation import
2015-04-08 06:13:49 -07: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
Geoff Mendal
f5215056be Merge "Import translations. DO NOT MERGE" 2015-04-08 12:55:20 +00:00
Geoff Mendal
032492572e Import translations. DO NOT MERGE
Change-Id: Ib75733c03e1a3350e192c9967a0f8b2e4b49e8c2
Auto-generated-cl: translation import
2015-04-08 05:52:41 -07:00
Olawale Ogunwale
1bdbce295c Merge "[ActivityManager] Finish the failed-to-pause activity" 2015-04-08 12:51:12 +00:00
Geoff Mendal
3ebbdd03ea Import translations. DO NOT MERGE
Change-Id: I0f9b0b3036a149b304b874fbaa2d95cf56e4e816
Auto-generated-cl: translation import
2015-04-08 05:35:59 -07:00
Tomasz Mikolajewski
86213c9486 Use default theme for StandaloneActivity (DocumentsUI).
Change-Id: I41841702e0b68123cb73ff1203ca6e6fe5eae320
2015-04-08 20:35:33 +09:00
Tomasz Mikolajewski
78699be5ff Add StubProvider::isChildDocument().
Change-Id: Ib17df4307c1f658c42468f86e1f66d4469eefe58
2015-04-08 19:38:55 +09: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
Clara Bayarri
2f92e9710a Merge "Floating toolbar: Create the FloatingActionMode and use it in DecorView." 2015-04-08 08:00:01 +00:00
Romain Guy
492c836f83 am 5b61a282: am e4d787b2: am 80e455e3: Merge "Prevent possible memory leak in SpanSet"
* commit '5b61a282255b5273f5194db73f3c88550dc11a57':
  Prevent possible memory leak in SpanSet
2015-04-08 07:38:58 +00:00
Romain Guy
5b61a28225 am e4d787b2: am 80e455e3: Merge "Prevent possible memory leak in SpanSet"
* commit 'e4d787b277a4b9435688c7e6f380bfc367751f76':
  Prevent possible memory leak in SpanSet
2015-04-08 07:27:58 +00: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
Jae Seo
9054431af3 Merge "TIF: Redefine time shift status and change callback and position APIs" 2015-04-08 04:42:36 +00:00
Tomasz Mikolajewski
2c696c4cc6 Merge "Add an initial version for a StubProvider for DocumentsUI." 2015-04-08 04:19:40 +00:00