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

36949 Commits

Author SHA1 Message Date
Winson Chung
76c72cdc89 Merge "Fixing regression in call to showRecents()." into nyc-dev am: e981777f0e 
am: 3da6a8d8a3

* commit '3da6a8d8a3faeb08cf0f3f5684295492d2dec8ec':
  Fixing regression in call to showRecents().

Change-Id: Id3ddd9809ca5a3bc8df84b34d8356acf2c9d6ac9
 2016-05-09 21:55:28 +00:00
Paul Crowley
5f0856afc3 Merge "Two phases to set the password for disk encryption" into nyc-dev am: 9aa6bb5a4a 
am: d365ddbd73

* commit 'd365ddbd736729415df5a9b5823e74ad87ac2380':
  Two phases to set the password for disk encryption

Change-Id: I11a856a217d8313925385e2b053afe2356a4646e
 2016-05-09 21:55:25 +00:00
Winson
3da6a8d8a3 Merge "Fixing regression in call to showRecents()." into nyc-dev 
am: e981777f0e

* commit 'e981777f0e92f7e35d283a41c98f4d99e561c679':
  Fixing regression in call to showRecents().

Change-Id: Ic1b762945828aaaa99cfa96a5b86132e671bc025
 2016-05-09 21:50:23 +00:00
Paul Crowley
d365ddbd73 Merge "Two phases to set the password for disk encryption" into nyc-dev 
am: 9aa6bb5a4a

* commit '9aa6bb5a4a8bd00a175e8a9c338b52bc24a162b4':
  Two phases to set the password for disk encryption

Change-Id: Ic8102ebd218f387236aa5ef013ccdf4bc8f58ce1
 2016-05-09 21:50:20 +00:00
Winson Chung
e981777f0e Merge "Fixing regression in call to showRecents()." into nyc-dev 2016-05-09 21:36:57 +00:00
Paul Crowley
9aa6bb5a4a Merge "Two phases to set the password for disk encryption" into nyc-dev 2016-05-09 21:35:34 +00:00
Chong Zhang
4b73b0cf94 Merge "Fix a flicker when opening app again quickly while it\'s exiting" into nyc-dev am: a806e8ab12 
am: 3f8315a923

* commit '3f8315a923aea0b57f1c086b0bf02d891745a196':
  Fix a flicker when opening app again quickly while it's exiting

Change-Id: I82cf878f3a556bd3a12b6adad2bc7dfe573c253b
 2016-05-09 21:33:15 +00:00
Chong Zhang
3f8315a923 Merge "Fix a flicker when opening app again quickly while it\'s exiting" into nyc-dev 
am: a806e8ab12

* commit 'a806e8ab1213ef420c9c0d541dbbe96a7d9f1472':
  Fix a flicker when opening app again quickly while it's exiting

Change-Id: I5b993179c73b8204f0a2be922a6a315bfefaca0f
 2016-05-09 21:27:59 +00:00
Amith Yamasani
9b0330f8db Merge "Workaround for assist crash with multiwindow" into nyc-dev am: 9fb0e97ecb 
am: 6ee39c8086

* commit '6ee39c8086190ef8c020350bd6393d66ae8f5337':
  Workaround for assist crash with multiwindow

Change-Id: I57b007fb123d49de6a784f1f0efc5fb82c089f8c
 2016-05-09 21:17:13 +00:00
Chong Zhang
a806e8ab12 Merge "Fix a flicker when opening app again quickly while it's exiting" into nyc-dev 2016-05-09 21:16:49 +00:00
Amith Yamasani
6ee39c8086 Merge "Workaround for assist crash with multiwindow" into nyc-dev 
am: 9fb0e97ecb

* commit '9fb0e97ecb732585d3c8855b459fd1f8e52f7d2b':
  Workaround for assist crash with multiwindow

Change-Id: I06c4d611175b2d85978cf1f0cd2c46a30ca748a3
 2016-05-09 21:11:40 +00:00
TreeHugger Robot
9fb0e97ecb Merge "Workaround for assist crash with multiwindow" into nyc-dev 2016-05-09 21:04:00 +00:00
Winson
14db362511 Fixing regression in call to showRecents(). 
- Previously, the call was made to showRecents() which took a single 
  boolean to determine alt-tab state, and after the refactoring, it
  no longer made the same call.

Bug: 28663474
Change-Id: I75fb793e56c9a094a4372d7157dbd0dd7ecdbda7
 2016-05-09 13:34:07 -07:00
Joe Onorato
adf2a6240d Merge changes I04301fbd,If6577602 into nyc-dev am: ac29617c6e 
am: 4240daca3a

* commit '4240daca3afe78652d775bf5431beb9e10c531d3':
  Flesh out the docs for the android.os.health package.
  Properly blame the correct uid for wakeup alarms that don't have a WorkSource.

Change-Id: I773937e0b0a5c1021e1c0716e06ec29f6f78a351
 2016-05-09 20:22:40 +00:00
Philip P. Moltmann
0b59883bfa Merge "Init MidiService once system user gets unlocked." into nyc-dev am: da08abed1e 
am: 80db52bf16

* commit '80db52bf1614d308386e8e90c848b63b53779158':
  Init MidiService once system user gets unlocked.

Change-Id: If28f78f905f07a08f6feeb12405a2bd6c8567eed
 2016-05-09 20:22:34 +00:00
Joe Onorato
8b552ed03c Merge changes I04301fbd,If6577602 into nyc-dev 
am: ac29617c6e

* commit 'ac29617c6e11085c9648d150a50c5daa15d65645':
  Flesh out the docs for the android.os.health package.
  Properly blame the correct uid for wakeup alarms that don't have a WorkSource.

Change-Id: If9d0461325336f6c5cb6faca34bac17c8ef6a35e
 2016-05-09 20:17:06 +00:00
Philip P. Moltmann
4015b12b11 Merge "Init MidiService once system user gets unlocked." into nyc-dev 
am: da08abed1e

* commit 'da08abed1e604238399bad02849c47c4d7447bf3':
  Init MidiService once system user gets unlocked.

Change-Id: Icc1141feacd85ccef6704eeed53894b4a6ee922f
 2016-05-09 20:17:03 +00:00
Joe Onorato
4240daca3a Merge changes I04301fbd,If6577602 into nyc-dev 
am: ac29617c6e

* commit 'ac29617c6e11085c9648d150a50c5daa15d65645':
  Flesh out the docs for the android.os.health package.
  Properly blame the correct uid for wakeup alarms that don't have a WorkSource.

Change-Id: I28bae3d984af6d19852fb63eda5fb21c1b6c98dd
 2016-05-09 20:16:56 +00:00
Philip P. Moltmann
80db52bf16 Merge "Init MidiService once system user gets unlocked." into nyc-dev 
am: da08abed1e

* commit 'da08abed1e604238399bad02849c47c4d7447bf3':
  Init MidiService once system user gets unlocked.

Change-Id: I6aa45702b4de90125c87bb5be280178e44416485
 2016-05-09 20:16:47 +00:00
TreeHugger Robot
ac29617c6e Merge changes I04301fbd,If6577602 into nyc-dev 
* changes:
  Flesh out the docs for the android.os.health package.
  Properly blame the correct uid for wakeup alarms that don't have a WorkSource.
 2016-05-09 20:05:13 +00:00
Philip P. Moltmann
da08abed1e Merge "Init MidiService once system user gets unlocked." into nyc-dev 2016-05-09 20:04:39 +00:00
Philip P. Moltmann
3ed7595216 Init MidiService once system user gets unlocked. 
Bug: 28621670
Change-Id: I358aa8db6d1408c317f4ca66b4e5c5cbbcfe0826
 2016-05-09 12:51:18 -07:00
Amith Yamasani
02c80c63d4 Workaround for assist crash with multiwindow 
Temporarily disable multiwindow assist until
Bug: 28348867
is fixed correctly.

Change-Id: Ia9d0fb5d4412e87aada90e8dcffe829b61221c6c
 2016-05-09 12:46:23 -07:00
Wale Ogunwale
eb17f74cc4 Merge "Don\'t include IME in app screenshot while in multi-window mode" into nyc-dev am: de5a7afc79 
am: b201170cdc

* commit 'b201170cdc46770332c1ef4eff4c22690f3cb100':
  Don't include IME in app screenshot while in multi-window mode

Change-Id: Ic306e90ac0d0c0f38f801b91f73b54f00a6913ce
 2016-05-09 18:33:36 +00:00
Wale Ogunwale
28024d64d3 Merge "Don\'t include IME in app screenshot while in multi-window mode" into nyc-dev 
am: de5a7afc79

* commit 'de5a7afc7989ecef051635fdc9ae52a69870c026':
  Don't include IME in app screenshot while in multi-window mode

Change-Id: I38856256a6da41e16c2433079f0476ee44b8faac
 2016-05-09 18:27:58 +00:00
Wale Ogunwale
b201170cdc Merge "Don\'t include IME in app screenshot while in multi-window mode" into nyc-dev 
am: de5a7afc79

* commit 'de5a7afc7989ecef051635fdc9ae52a69870c026':
  Don't include IME in app screenshot while in multi-window mode

Change-Id: Ied1ae82727daadf9b69397076f6c0102a6a5bfa3
 2016-05-09 18:27:56 +00:00
Chong Zhang
e22006d936 Fix a flicker when opening app again quickly while it's exiting 
If the app is waiting for an opening animation with a dummy placeholder,
we need to skip the surface placement (in addition to the animateLocked).

Also, when animating is changing from exiting to entering, the mAnimating
flag needs to be cleared until the new animation starts. This prevents the
surface placement to place it wrong before the new animaition starts.

bug: 28599295
bug: 27742244
Change-Id: I26f0ead80ee9993a6c766ae8686ab11d1729519c
 2016-05-09 11:25:45 -07:00
TreeHugger Robot
de5a7afc79 Merge "Don't include IME in app screenshot while in multi-window mode" into nyc-dev 2016-05-09 18:22:29 +00:00
Joe Onorato
78bcdf91ed Properly blame the correct uid for wakeup alarms that don't have a WorkSource. 
It was setting the uid to -1, but BatteryStats should be tracking the actual uid.

Bug: 28637246
Change-Id: If6577602e3fe59a95b5cece4fc99e704ba43c03e
 2016-05-09 10:32:30 -07:00
Richard Uhler
883f8dd3e3 Merge "Remove inconsistent \'cmd package compile\' documentation." into nyc-dev am: 12f2984dbf 
am: 36941c7a63

* commit '36941c7a63d1b3bedfed34ca1c083a77b358092f':
  Remove inconsistent 'cmd package compile' documentation.

Change-Id: I88d6a018a5a8e61c3d310e44fdf0917fb8528563
 2016-05-09 15:57:14 +00:00
Richard Uhler
36941c7a63 Merge "Remove inconsistent \'cmd package compile\' documentation." into nyc-dev 
am: 12f2984dbf

* commit '12f2984dbf10e89124afd7bf8242f564e5a176aa':
  Remove inconsistent 'cmd package compile' documentation.

Change-Id: I94caee4a39e4ef48daa6645cdfc1e07b55d22f52
 2016-05-09 15:53:20 +00:00
Richard Uhler
4500ff5105 Merge "Remove inconsistent \'cmd package compile\' documentation." into nyc-dev 
am: 12f2984dbf

* commit '12f2984dbf10e89124afd7bf8242f564e5a176aa':
  Remove inconsistent 'cmd package compile' documentation.

Change-Id: I00eb70c24edb5338294d0d43abcd3bcdf2121ef0
 2016-05-09 15:53:16 +00:00
Richard Uhler
12f2984dbf Merge "Remove inconsistent 'cmd package compile' documentation." into nyc-dev 2016-05-09 15:48:47 +00:00
Bo Hu
a2ca55ecb6 Merge "Ensure Netd Service is alive" into nyc-dev am: d521a6d146 
am: 9549841ec4

* commit '9549841ec488c21a848b240275c8af42deedb46e':
  Ensure Netd Service is alive

Change-Id: Ic0f6f3cbe9ede4d6a9dfd3e0e8788a7a997db234
 2016-05-09 01:40:22 +00:00
bohu
9549841ec4 Merge "Ensure Netd Service is alive" into nyc-dev 
am: d521a6d146

* commit 'd521a6d1467a41ba20744f63dd70a40be0f35be0':
  Ensure Netd Service is alive

Change-Id: I436e2092574c49fb915646038c254f6938569e77
 2016-05-09 01:37:46 +00:00
bohu
b3dac031cf Merge "Ensure Netd Service is alive" into nyc-dev 
am: d521a6d146

* commit 'd521a6d1467a41ba20744f63dd70a40be0f35be0':
  Ensure Netd Service is alive

Change-Id: I733966cdfbfeae1d5603bcbd175af5f7e3038a78
 2016-05-09 01:37:42 +00:00
Bo Hu
d521a6d146 Merge "Ensure Netd Service is alive" into nyc-dev 2016-05-09 01:32:17 +00:00
bohu
07cc3bb040 Ensure Netd Service is alive 
At least on android TV emulator system image, the Netd
service could be null when the setDnsConfigurationForNetwork
is invoked.

bug: 28553503
Change-Id: If059495c8573ede287c4e9d8f343318d519fca7f
 2016-05-08 07:56:59 -07:00
Wale Ogunwale
a5434dd987 Don't include IME in app screenshot while in multi-window mode 
We don't screenshot the IME in multi-window mode because the frame
of the IME might not overlap with that of the app. E.g. IME target
app at the top in split-screen mode and the IME at the bottom
overlapping with the bottom app.

Bug: 28446505
Change-Id: Iae4f7eafa582779a4cf2aba3d83c4d9f76a4ccca
 2016-05-07 16:40:45 -07:00
Jorim Jaggi
86a2717e7c Merge "Fix minimized state messup" into nyc-dev am: dce92891df 
am: 7f5e29b255

* commit '7f5e29b255c1e06f679eecacbde8f26488ca512e':
  Fix minimized state messup

Change-Id: I4e9e9863aae3c560743afb29454a78995d2dd261
 2016-05-07 00:10:33 +00:00
Jorim Jaggi
35eb130d8d Merge "Fix minimized state messup" into nyc-dev 
am: dce92891df

* commit 'dce92891df42d5ad8cdcb6ecade5b2801a14f090':
  Fix minimized state messup

Change-Id: I1e93e00fe342d04ee644855e52c8caedea6de758
 2016-05-07 00:08:01 +00:00
Jorim Jaggi
7f5e29b255 Merge "Fix minimized state messup" into nyc-dev 
am: dce92891df

* commit 'dce92891df42d5ad8cdcb6ecade5b2801a14f090':
  Fix minimized state messup

Change-Id: I8aba9be1767593da365c3192bfaa89821f8bf527
 2016-05-07 00:07:58 +00:00
Chris Craik
8e6609fc7e Merge "Reset transparent region when saving a surface" into nyc-dev am: 52b952a296 
am: f6f6c47229

* commit 'f6f6c47229f9bb8ec531ade4a65a6802d959ccd0':
  Reset transparent region when saving a surface

Change-Id: I0e13f1103ea526f79e8dcb845ee28e0236aa53d3
 2016-05-07 00:07:35 +00:00
Chris Craik
92529363d0 Merge "Reset transparent region when saving a surface" into nyc-dev 
am: 52b952a296

* commit '52b952a296b84283db9041de96e2ff408b221572':
  Reset transparent region when saving a surface

Change-Id: Ida763eab76b258a5f454aa4249cbd7ce3a02c81a
 2016-05-07 00:02:50 +00:00
Chris Craik
f6f6c47229 Merge "Reset transparent region when saving a surface" into nyc-dev 
am: 52b952a296

* commit '52b952a296b84283db9041de96e2ff408b221572':
  Reset transparent region when saving a surface

Change-Id: I78370c1a6678500a13d9d234679fd081dbf58dac
 2016-05-07 00:02:49 +00:00
TreeHugger Robot
dce92891df Merge "Fix minimized state messup" into nyc-dev 2016-05-06 23:58:28 +00:00
Felipe Leme
9f144cb395 Merge "Fixed connectivity state in some restricted network scenarios." into nyc-dev am: 638a6e8140 
am: 87d20317bf

* commit '87d20317bf26e87ef58798d3c5aafb81aa163788':
  Fixed connectivity state in some restricted network scenarios.

Change-Id: Ifeb332fbf00c554b78d0ad724b34e3a8ebfc9894
 2016-05-06 23:43:55 +00:00
TreeHugger Robot
52b952a296 Merge "Reset transparent region when saving a surface" into nyc-dev 2016-05-06 23:42:34 +00:00
Felipe Leme
87d20317bf Merge "Fixed connectivity state in some restricted network scenarios." into nyc-dev 
am: 638a6e8140

* commit '638a6e8140a22a0ddb5d5dacb02173795073bd1a':
  Fixed connectivity state in some restricted network scenarios.

Change-Id: I5d3fdbbff6d92be9657d3ed466462ca911d20881
 2016-05-06 23:39:09 +00:00
Felipe Leme
9a48ee1b3e Merge "Fixed connectivity state in some restricted network scenarios." into nyc-dev 
am: 638a6e8140

* commit '638a6e8140a22a0ddb5d5dacb02173795073bd1a':
  Fixed connectivity state in some restricted network scenarios.

Change-Id: I0fd66b16c83680940f294ea8e117443ffd8a50cd
 2016-05-06 23:38:59 +00:00