drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
187,674 Commits 1 Branch 0 Tags
Commit Graph

187674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
2a39aef439 Merge "Fix crash when removing draw listener" 2015-04-08 18:11:44 +00: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
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
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
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
Tomasz Mikolajewski
0fc8beb2df Add an initial version for a StubProvider for DocumentsUI. 
It will be used for testing as well as for development.

Change-Id: I1556836e1070d9e4483d2574bba40aa2fdfde229
 2015-04-08 13:14:52 +09:00
Eric Gilmore
e71c0e315f am d242647a: am 1fb61c46: am b1044aaf: am 8ba1380f: am a4f72eb0: am aac938a8: Merge "Fixing date." into lmp-docs 
* commit 'd242647afa201cb160db1582ac53dec074292446':
  Fixing date.
 2015-04-08 02:15:51 +00:00
Selim Gurun
6dc7ca3040 Merge "Fix Google app crash" 2015-04-08 01:54:45 +00:00
Eric Gilmore
d242647afa am 1fb61c46: am b1044aaf: am 8ba1380f: am a4f72eb0: am aac938a8: Merge "Fixing date." into lmp-docs 
* commit '1fb61c4688c37677020c66b96f067074b1dab3b4':
  Fixing date.
 2015-04-08 01:49:50 +00:00
Selim Gurun
7e01c4ceb6 Fix Google app crash 
Bug: 20110378

Until chromium imlementation lands, use the base implementation.

Change-Id: Icd8e83503770471219718fb38a131938b1bbf0c2
 2015-04-07 18:40:14 -07: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
Ying Wang
50d126bc24 Merge "Fix 64-bit build." 2015-04-08 01:05:30 +00:00
Ying Wang
05f5674ae8 Fix 64-bit build. 
Change-Id: I9f2e2edf276f98864b65708b746bf938a4a3c8d6
 2015-04-07 18:03:31 -07:00
Tomasz Mikolajewski
4caa91000b Merge "Fix broken tests in DocumentsUI." 2015-04-08 00:55:52 +00:00
Tomasz Mikolajewski
8090ffe633 Fix broken tests in DocumentsUI. 
Change-Id: Ia41eda4d9f500882ca7eb62b13a4bca60978bc33
 2015-04-08 09:54:43 +09: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
Jae Seo
465f0d6aa3 TIF: Redefine time shift status and change callback and position APIs 
Also added/modified the documentation and addressed feedback from the
previous CL.

Change-Id: I046970cd0d2688886039d37a332bbe11bc5a4b0f
 2015-04-07 17:34:39 -07:00
Eric Gilmore
a4f72eb079 am aac938a8: Merge "Fixing date." into lmp-docs 
* commit 'aac938a8597efb8d71ce7dc124779f1d268510eb':
  Fixing date.
 2015-04-08 00:33:07 +00:00
Fabrice Di Meglio
9f3f6000ed Merge "Add IntentFilter auto verification - part 3" 2015-04-08 00:30:37 +00:00
Fabrice Di Meglio
0788595e0c Add IntentFilter auto verification - part 3 
- add private API PackageManager.getAllIntentFilters(String)
for getting all IntentFilters from a given package
- update IntentFilterVerificationInfo to use an ArrayList<String>
for domains instead of a String[]
- if you make an App a default domain handler then make the
others as non default
- create an IntentVerificationInfo even if the App IntentFilters
do not need to be verified. This would be done only if the App
has some domain URLs defined and would allow to make it the
default handler for a domain
- a few code optimizations here and there

Change-Id: I4535372a0bb1a2c8e662e1485be8ca700003e9b3
 2015-04-07 17:13:32 -07:00