Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
251,177 Commits 3 Branches 0 Tags
555271d3ae8ef899bc9dab01ac9753c4fa657e2d
Commit Graph

251177 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
555271d3ae Merge "Fix status bar background flicker" into nyc-dev am: d0fa4d3aaf 
am: fa050d6355

* commit 'fa050d635590328fc787fb14d964585a5641461f':
  Fix status bar background flicker

Change-Id: Ia8f181646bbd1943fb7a8e04cc9571a56a5051f7
 2016-05-06 01:59:05 +00:00
Wale Ogunwale
ffaa458dd9 Merge "Fixed deadlock between AM and WM when animating pinned stack." into nyc-dev am: 3a94ec5617 
am: 97c1a72c3c

* commit '97c1a72c3ced7192d300e6fd855d5c87ee33eb70':

Change-Id: Ie89de9b5900920e5ce9db9af6f98227d98e27d78
 2016-05-06 01:58:52 +00:00
Chris Craik
fa050d6355 Merge "Fix status bar background flicker" into nyc-dev 
am: d0fa4d3aaf

* commit 'd0fa4d3aafa42da696c006ab96a11ed54deec14c':
  Fix status bar background flicker

Change-Id: I8cb0909f952aa0e8bf7705d753fd1bc0953187ba
 2016-05-06 01:56:56 +00:00
Wale Ogunwale
99a4f256fc Merge "Fixed deadlock between AM and WM when animating pinned stack." into nyc-dev am: 3a94ec5617 
am: f8c77eee6d

* commit 'f8c77eee6da6857673882177955a98af6c1164b9':
  Fixed deadlock between AM and WM when animating pinned stack.

Change-Id: Ied4dc91a5f36ed2a480470925b3f60145ad8ac29
 2016-05-06 01:56:26 +00:00
Wale Ogunwale
97c1a72c3c Merge "Fixed deadlock between AM and WM when animating pinned stack." into nyc-dev 
am: 3a94ec5617

* commit '3a94ec56173170306b2304c858dbbeb99c3c93cc':
  Fixed deadlock between AM and WM when animating pinned stack.

Change-Id: I51938073894ec18042a987645a424811213061ad
 2016-05-06 01:51:47 +00:00
Wale Ogunwale
f8c77eee6d Merge "Fixed deadlock between AM and WM when animating pinned stack." into nyc-dev 
am: 3a94ec5617

* commit '3a94ec56173170306b2304c858dbbeb99c3c93cc':
  Fixed deadlock between AM and WM when animating pinned stack.

Change-Id: Ie5f929b7a27f8fd3fc7f25b55066d8e45f97a444
 2016-05-06 01:51:43 +00:00
TreeHugger Robot
d0fa4d3aaf Merge "Fix status bar background flicker" into nyc-dev 2016-05-06 01:49:34 +00:00
TreeHugger Robot
3a94ec5617 Merge "Fixed deadlock between AM and WM when animating pinned stack." into nyc-dev 2016-05-06 01:43:31 +00:00
Android Build Merger (Role)
8d0cc08d06 Merge "Fix edge case crash with invalid bitmap dimensions. am: f9e79e0499 am: 616a2a158a" into nyc-mr1-dev-plus-aosp 2016-05-06 00:54:09 +00:00
Winson
b1625058d0 Fix edge case crash with invalid bitmap dimensions. am: f9e79e0499 
am: 616a2a158a

* commit '616a2a158a6a156029fd748acf36282601f9697a':

Change-Id: Id5d02b1a5d898dcc49301c6943ded638348014c3
 2016-05-06 00:53:40 +00:00
Android Build Merger (Role)
a7d61ab92f Merge "Fix edge case crash with invalid bitmap dimensions. am: f9e79e0499 am: 616a2a158a" into nyc-mr1-dev-plus-aosp 2016-05-06 00:51:44 +00:00
Winson
ec78e7db90 Fix edge case crash with invalid bitmap dimensions. am: f9e79e0499 
am: 948c3638a8

* commit '948c3638a8981d3958b7eb500e128011005fd5e3':
  Fix edge case crash with invalid bitmap dimensions.

Change-Id: I5e88a94f9f8a3e0799046a5e2ce3ed06850455a9
 2016-05-06 00:51:15 +00:00
Winson
e833f23881 Fix edge case crash with invalid bitmap dimensions. am: f9e79e0499 
am: 616a2a158a

* commit '616a2a158a6a156029fd748acf36282601f9697a':
  Fix edge case crash with invalid bitmap dimensions.

Change-Id: I88f2e65efcaf10588985a76c30964ff87b614575
 2016-05-06 00:51:08 +00:00
Winson
616a2a158a Fix edge case crash with invalid bitmap dimensions. 
am: f9e79e0499

* commit 'f9e79e0499a114b184e0d0f4dbd45b3d690a4657':
  Fix edge case crash with invalid bitmap dimensions.

Change-Id: Id8464d81b228ff917226a7088ab9199b885c32c2
 2016-05-06 00:46:44 +00:00
Winson
948c3638a8 Fix edge case crash with invalid bitmap dimensions. 
am: f9e79e0499

* commit 'f9e79e0499a114b184e0d0f4dbd45b3d690a4657':
  Fix edge case crash with invalid bitmap dimensions.

Change-Id: Icbf146700a3d2cbea268eb3dbe4f2998099d05d5
 2016-05-06 00:46:38 +00:00
Winson
f9e79e0499 Fix edge case crash with invalid bitmap dimensions. 
- In these cases, skip returning an animation spec for that task

Bug: 28235453
Change-Id: I611dc4390c0cbd2ca5f16112e4784848b2d6896f
 2016-05-06 00:35:10 +00:00
Wale Ogunwale
2ba712905f Fixed deadlock between AM and WM when animating pinned stack. 
In Ie18cc04ceeabd94093017f79676253e1189f5249 we delay ending the
pinned stack animation until app transition is done. However, the
signal that app transition is done comes in with the window manager
lock held and the we call into AM to do some additional work which
requires AM lock to be aquired. Since AM depends on WM we shouldn't
be holding the WM lock while calling into AM since AM can call into
WM with its lock held. We now post a runnable to finish the pinned
stack animation without the WM lock held.

Bug: 28564514
Change-Id: I8450123e992e569a74609883de810cdc611ced81
 2016-05-05 16:47:45 -07:00
Android Build Merger (Role)
bb0bd465d3 Merge "Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev am: c1ff12eccd am: 001f8c57a8" into nyc-mr1-dev-plus-aosp 2016-05-05 23:44:17 +00:00
Adam Lesinski
66ee8cb747 Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev am: c1ff12eccd 
am: 001f8c57a8

* commit '001f8c57a845e89686b57a8652891f43eee95c45':

Change-Id: Ic8971b858ca0ab5b7e12f0fcce3f14b51811b428
 2016-05-05 23:43:48 +00:00
Android Build Merger (Role)
55e79b973c Merge "Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev am: c1ff12eccd am: 001f8c57a8" into nyc-mr1-dev-plus-aosp 2016-05-05 23:40:54 +00:00
Adam Lesinski
f923d07974 Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev am: c1ff12eccd 
am: 001f8c57a8

* commit '001f8c57a845e89686b57a8652891f43eee95c45':
  Fix issue where existing Activity Resources references would not update

Change-Id: I4398ce59dc10561070f7d26abc23c34eed83ba92
 2016-05-05 23:40:27 +00:00
Adam Lesinski
77acaf86b3 Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev am: c1ff12eccd 
am: 3297250b9c

* commit '3297250b9cc068715d36c039133db5bf0083b9cc':
  Fix issue where existing Activity Resources references would not update

Change-Id: I1f9dfebf5deb3d1a9cf49cc9042a02a90c3c7a68
 2016-05-05 23:40:25 +00:00
Adam Lesinski
3297250b9c Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev 
am: c1ff12eccd

* commit 'c1ff12eccd0e48ff7feab62387e60ae4010a3cc9':
  Fix issue where existing Activity Resources references would not update

Change-Id: I1b411b89dae0aa623d796ab2ab7dabb52a6e28c0
 2016-05-05 23:35:31 +00:00
Adam Lesinski
001f8c57a8 Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev 
am: c1ff12eccd

* commit 'c1ff12eccd0e48ff7feab62387e60ae4010a3cc9':
  Fix issue where existing Activity Resources references would not update

Change-Id: I91cecfc1b5942d7e1c069e739be72a23472f6d47
 2016-05-05 23:35:28 +00:00
Android Build Merger (Role)
6674151189 Merge "Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev am: 7d2a0a0571 am: 46d24970ed" into nyc-mr1-dev-plus-aosp 2016-05-05 23:24:32 +00:00
Vladislav Kaznacheev
bee0cefc2f Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev am: 7d2a0a0571 
am: 46d24970ed

* commit '46d24970ed0b17136afcd99e07565402c99b9728':

Change-Id: I7fc6d4922b32f0b03b5e29b87c85cec938be8551
 2016-05-05 23:24:06 +00:00
Adam Lesinski
c1ff12eccd Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev 2016-05-05 23:23:43 +00:00
Chris Craik
867b812eff Fix status bar background flicker 
Fixes: 28533578

Change-Id: I075f49b7d20e0e95e790a9755d104a0a51575054
 2016-05-05 16:22:21 -07:00
Android Build Merger (Role)
19a3472ca5 Merge "Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev am: 7d2a0a0571 am: 46d24970ed" into nyc-mr1-dev-plus-aosp 2016-05-05 23:22:01 +00:00
Vladislav Kaznacheev
0393d26f4e Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev am: 7d2a0a0571 
am: 46d24970ed

* commit '46d24970ed0b17136afcd99e07565402c99b9728':
  Add @TestApi to ActivityOptions.setLaunchStackId

Change-Id: I4712bb84a994379c86d651ebc946478130d80daa
 2016-05-05 23:21:33 +00:00
Vladislav Kaznacheev
cae475563a Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev am: 7d2a0a0571 
am: f1febf2700

* commit 'f1febf27006a98adc5de584e7703338b85208ed3':
  Add @TestApi to ActivityOptions.setLaunchStackId

Change-Id: I13c413b1f0520262c271a397751a1a055e464655
 2016-05-05 23:21:04 +00:00
Vladislav Kaznacheev
f1febf2700 Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev 
am: 7d2a0a0571

* commit '7d2a0a05715841b582cbaefa3fd0e0a542064556':
  Add @TestApi to ActivityOptions.setLaunchStackId

Change-Id: I7996b43fa80b5965feb69028be2526faa379a134
 2016-05-05 23:16:07 +00:00
Vladislav Kaznacheev
46d24970ed Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev 
am: 7d2a0a0571

* commit '7d2a0a05715841b582cbaefa3fd0e0a542064556':
  Add @TestApi to ActivityOptions.setLaunchStackId

Change-Id: I51b1329b14754fa9f765452769a4e311a69ae6bb
 2016-05-05 23:16:04 +00:00
Adam Lesinski
8ce4e12c73 Fix issue where existing Activity Resources references would not update 
When relaunching an Activity, the DecorView and ViewRootImpl is re-used,
along with the IBinder activity token. This means that when we create
new resources, we end up just updating the base Activity resources.

However, we would set the configuration to the new requested override
config and then proceed to update existing Resources references, which
would return immediately due to the equality check for configuration
updates.

This change pushes the setting of the new override config to the
updateResourcesForActivity method, which will properly update Resources
references that are held in the re-used DecorView.

Bug:27915587
Change-Id: I113007a40fa464b8a234b073dcf851e16fee0177
 2016-05-05 23:08:09 +00:00
Vladislav Kaznacheev
7d2a0a0571 Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev 2016-05-05 23:04:49 +00:00
Android Build Merger (Role)
34fe9e0ee0 Merge "Correct docs about what is ignored in full-data backup am: c5be8f8a4b am: f4f2ef5162" into nyc-mr1-dev-plus-aosp 2016-05-05 22:39:50 +00:00
Christopher Tate
9867a7b80f Correct docs about what is ignored in full-data backup am: c5be8f8a4b 
am: f4f2ef5162

* commit 'f4f2ef5162942d66da8143f4ff539d7dcb5e0939':

Change-Id: I93d4a98327fc180ef916c0230d5e09c4aca54995
 2016-05-05 22:39:22 +00:00
Android Build Merger (Role)
ad53462e49 Merge "Correct docs about what is ignored in full-data backup am: c5be8f8a4b am: f4f2ef5162" into nyc-mr1-dev-plus-aosp 2016-05-05 22:37:18 +00:00
Christopher Tate
3d7fa5d773 Correct docs about what is ignored in full-data backup am: c5be8f8a4b 
am: f4f2ef5162

* commit 'f4f2ef5162942d66da8143f4ff539d7dcb5e0939':
  Correct docs about what is ignored in full-data backup

Change-Id: I93cb750965951bfeaeaae27c32a8e81b8ba6bd1c
 2016-05-05 22:36:54 +00:00
Christopher Tate
fb74b50b19 Correct docs about what is ignored in full-data backup am: c5be8f8a4b 
am: 3f0db943c5

* commit '3f0db943c589738fc09e7bb45c10a319b41955fa':
  Correct docs about what is ignored in full-data backup

Change-Id: I00bb2ffdb52af988d9b7c231864b629fb2e27dbd
 2016-05-05 22:36:42 +00:00
Christopher Tate
3f0db943c5 Correct docs about what is ignored in full-data backup 
am: c5be8f8a4b

* commit 'c5be8f8a4b9946f26f43201a06e7ec3f9b34857e':
  Correct docs about what is ignored in full-data backup

Change-Id: If70b6d247126758dcc82ec7780060ad99253a32d
 2016-05-05 22:31:54 +00:00
Christopher Tate
f4f2ef5162 Correct docs about what is ignored in full-data backup 
am: c5be8f8a4b

* commit 'c5be8f8a4b9946f26f43201a06e7ec3f9b34857e':
  Correct docs about what is ignored in full-data backup

Change-Id: Id1618de0e4027135a320cd133c244ba33d2960aa
 2016-05-05 22:31:53 +00:00
Android Build Merger (Role)
df13127b4e Merge "Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev am: 47384f90b4 am: cad814b9bf" into nyc-mr1-dev-plus-aosp 2016-05-05 22:30:35 +00:00
Joe Onorato
060bc6129c Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev am: 47384f90b4 
am: cad814b9bf

* commit 'cad814b9bf6504c2643ba32a5397d8f2871ac49e':

Change-Id: Id6e31705015a4690f5c1e74ed6bfc0499db61556
 2016-05-05 22:30:03 +00:00
Android Build Merger (Role)
0195194d85 Merge "Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev am: 47384f90b4 am: cad814b9bf" into nyc-mr1-dev-plus-aosp 2016-05-05 22:27:43 +00:00
Joe Onorato
068061ff06 Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev am: 47384f90b4 
am: 67af8a12ae

* commit '67af8a12ae20444f108f75c077b12821af52c909':
  Add the individual wakeup alarm counts to the batterystats checkin.

Change-Id: Ia87d4db58bbdf4695b280edf6b6a79ad5425eea7
 2016-05-05 22:27:01 +00:00
Joe Onorato
32377e0e7f Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev am: 47384f90b4 
am: cad814b9bf

* commit 'cad814b9bf6504c2643ba32a5397d8f2871ac49e':
  Add the individual wakeup alarm counts to the batterystats checkin.

Change-Id: I79fc93495a63d01184c3a7c9ac7d0a05e5f298bb
 2016-05-05 22:26:59 +00:00
Joe Onorato
67af8a12ae Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev 
am: 47384f90b4

* commit '47384f90b4adb6dc4a005a7870e0ec6841042151':
  Add the individual wakeup alarm counts to the batterystats checkin.

Change-Id: I0bfd7f8967e828500fbae93673ec2bbf31d42b1c
 2016-05-05 22:22:02 +00:00
Joe Onorato
cad814b9bf Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev 
am: 47384f90b4

* commit '47384f90b4adb6dc4a005a7870e0ec6841042151':
  Add the individual wakeup alarm counts to the batterystats checkin.

Change-Id: I86640737d6f188b6b00901937d498ce1148ec10f
 2016-05-05 22:21:49 +00:00
Christopher Tate
c5be8f8a4b Correct docs about what is ignored in full-data backup 
You can't back up content in e.g. getNoBackupFilesDir() even if your
app explicitly tries to.

Bug 28321431

Change-Id: Ifa2a4bc518de03aba4c8809e60d8bb90fce767f8
 2016-05-05 22:20:46 +00:00