Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
257,604 Commits 3 Branches 0 Tags
e87b5750466508e3e6a28f95ef035865d022d0b9
Commit Graph

257604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wale Ogunwale
e87b575046 Merge "Dismiss docked stack if an activity is shown on top of the lock screen" into nyc-dev am: 5d6a218d9e am: d9125edb98 
am: 94d93dd38f

* commit '94d93dd38fbab0ff8f9a9ce397a522cf2fcd6429':
  Dismiss docked stack if an activity is shown on top of the lock screen

Change-Id: Iaaf1dc4cd6f4008bf4bc571bb70365d431ea30ed
 2016-05-06 18:54:56 +00:00
Wale Ogunwale
94d93dd38f Merge "Dismiss docked stack if an activity is shown on top of the lock screen" into nyc-dev am: 5d6a218d9e 
am: d9125edb98

* commit 'd9125edb98034562b5269a7cd97cc6bcac7a3238':
  Dismiss docked stack if an activity is shown on top of the lock screen

Change-Id: I0b0130142296468e43fdb106d214f43a8fc500e5
 2016-05-06 18:47:17 +00:00
Wale Ogunwale
d9125edb98 Merge "Dismiss docked stack if an activity is shown on top of the lock screen" into nyc-dev 
am: 5d6a218d9e

* commit '5d6a218d9e0d21367f6365d4de51532ca7e14dc9':
  Dismiss docked stack if an activity is shown on top of the lock screen

Change-Id: I4bf1ef48aef928e12d7dbb9faa6c4e0d489acadb
 2016-05-06 18:42:09 +00:00
Phil Weaver
2101140764 Merge "Merge "Make AccessibilityService#disableSelf atomic." into nyc-dev am: b42afe9be0 am: 8f6e8c43cb" into nyc-mr1-dev-plus-aosp 
am: 981ccc1468

* commit '981ccc1468a6bc37eceff9917b2d222bf2775c6f':

Change-Id: I2a98fb82dd9c0e888f913718677f78d5445eea11
 2016-05-06 18:41:41 +00:00
Phil Weaver
f1cebe25d4 Merge "Merge "Make AccessibilityService#disableSelf atomic." into nyc-dev am: b42afe9be0 am: 8f6e8c43cb" into nyc-mr1-dev-plus-aosp 
am: 36d0c08b1b

* commit '36d0c08b1bd9e48dcb77f0a8bb0db85bfc6f6ca8':

Change-Id: Ieb161e9c37398e9cd13f968e1022c8cb8a5f36a5
 2016-05-06 18:37:10 +00:00
Phil Weaver
feb225dbd7 Merge "Merge "Make AccessibilityService#disableSelf atomic." into nyc-dev am: b42afe9be0 am: 709fb89a9d" into nyc-mr1-dev-plus-aosp 
am: 5f215a2a4d

* commit '5f215a2a4dcc85e885dd844c63da493c9a3e83c1':
  Make AccessibilityService#disableSelf atomic.

Change-Id: Iddf073e9131c97493a0193ce8d9f04a1a229452f
 2016-05-06 18:37:06 +00:00
Chris Thornton
3e595e40a0 Merge "Merge "Fix NPE in KeyphraseEnrollmentInfo.toString()" into nyc-dev am: 0f6a7abb83 am: b6dba40c9e" into nyc-mr1-dev-plus-aosp 
am: d656cab54a

* commit 'd656cab54aafa2dbe96d8ae750177b43e1255a15':

Change-Id: Id6b5fcbc326c784894f481fd5c30e646bb686fc2
 2016-05-06 18:37:01 +00:00
Android Build Merger (Role)
981ccc1468 Merge "Merge "Make AccessibilityService#disableSelf atomic." into nyc-dev am: b42afe9be0 am: 8f6e8c43cb" into nyc-mr1-dev-plus-aosp 2016-05-06 18:36:16 +00:00
Phil Weaver
a7cdcd452d Merge "Make AccessibilityService#disableSelf atomic." into nyc-dev am: b42afe9be0 
am: 8f6e8c43cb

* commit '8f6e8c43cbd50b26c536b4e7f06428f75171c293':

Change-Id: I4533740f885a1001aca37f491a50558e2b083d2e
 2016-05-06 18:35:47 +00:00
Android Build Merger (Role)
36d0c08b1b Merge "Merge "Make AccessibilityService#disableSelf atomic." into nyc-dev am: b42afe9be0 am: 8f6e8c43cb" into nyc-mr1-dev-plus-aosp 2016-05-06 18:32:38 +00:00
Android Build Merger (Role)
5f215a2a4d Merge "Merge "Make AccessibilityService#disableSelf atomic." into nyc-dev am: b42afe9be0 am: 709fb89a9d" into nyc-mr1-dev-plus-aosp 2016-05-06 18:32:23 +00:00
Phil Weaver
3525e254ff Merge "Make AccessibilityService#disableSelf atomic." into nyc-dev am: b42afe9be0 
am: 8f6e8c43cb

* commit '8f6e8c43cbd50b26c536b4e7f06428f75171c293':
  Make AccessibilityService#disableSelf atomic.

Change-Id: I3c5c35e48ffa44953216d2aa5b5b7002875b402f
 2016-05-06 18:32:07 +00:00
Phil Weaver
16cd21cc6d Merge "Make AccessibilityService#disableSelf atomic." into nyc-dev am: b42afe9be0 
am: 709fb89a9d

* commit '709fb89a9d1ebd2c17f06bee621ed9316e484878':
  Make AccessibilityService#disableSelf atomic.

Change-Id: I26c6568b6bfd3097d244b74139256a9e89fe4793
 2016-05-06 18:31:59 +00:00
TreeHugger Robot
5d6a218d9e Merge "Dismiss docked stack if an activity is shown on top of the lock screen" into nyc-dev 2016-05-06 18:30:23 +00:00
Phil Weaver
709fb89a9d Merge "Make AccessibilityService#disableSelf atomic." into nyc-dev 
am: b42afe9be0

* commit 'b42afe9be02b23c50c0479e93df2a853be7c369a':
  Make AccessibilityService#disableSelf atomic.

Change-Id: I0c401dfbe7080535595e1c4b6b2365f17fab6dd9
 2016-05-06 18:26:22 +00:00
Phil Weaver
8f6e8c43cb Merge "Make AccessibilityService#disableSelf atomic." into nyc-dev 
am: b42afe9be0

* commit 'b42afe9be02b23c50c0479e93df2a853be7c369a':
  Make AccessibilityService#disableSelf atomic.

Change-Id: I90fc019bb38c2b8c5b71357bce60c8df298bddcc
 2016-05-06 18:26:21 +00:00
Chris Thornton
522f398334 Merge "Merge "Fix NPE in KeyphraseEnrollmentInfo.toString()" into nyc-dev am: 0f6a7abb83 am: b6dba40c9e" into nyc-mr1-dev-plus-aosp 
am: 719498c68c

* commit '719498c68cf02f3b4693a9f07da580792255d6a3':

Change-Id: I6f03a50714ca713c3b9dbf88c6dfb7da98a3734c
 2016-05-06 18:20:18 +00:00
Chris Thornton
94869bfae6 Merge "Fix NPE in KeyphraseEnrollmentInfo.toString()" into nyc-dev am: 0f6a7abb83 am: 6e3449b33f 
am: 6f2bd8f029

* commit '6f2bd8f0296a2ba075394847f5e62083a641cdef':
  Fix NPE in KeyphraseEnrollmentInfo.toString()

Change-Id: If42bd0ca41d745136f986dcdd29560766a72af84
 2016-05-06 18:20:14 +00:00
Android Build Merger (Role)
d656cab54a Merge "Merge "Fix NPE in KeyphraseEnrollmentInfo.toString()" into nyc-dev am: 0f6a7abb83 am: b6dba40c9e" into nyc-mr1-dev-plus-aosp 2016-05-06 18:19:19 +00:00
Chris Thornton
f94c4b7bd3 Merge "Fix NPE in KeyphraseEnrollmentInfo.toString()" into nyc-dev am: 0f6a7abb83 
am: b6dba40c9e

* commit 'b6dba40c9e9926a86236ec9e121e34bf787ba473':

Change-Id: I57b3394d7ddc12bddd7978b4dc729c450770329f
 2016-05-06 18:18:48 +00:00
Android Build Merger (Role)
719498c68c Merge "Merge "Fix NPE in KeyphraseEnrollmentInfo.toString()" into nyc-dev am: 0f6a7abb83 am: b6dba40c9e" into nyc-mr1-dev-plus-aosp 2016-05-06 18:16:07 +00:00
Chris Thornton
6f2bd8f029 Merge "Fix NPE in KeyphraseEnrollmentInfo.toString()" into nyc-dev am: 0f6a7abb83 
am: 6e3449b33f

* commit '6e3449b33fd081a1e920c8e66797e280e78de66b':
  Fix NPE in KeyphraseEnrollmentInfo.toString()

Change-Id: Ic891770dba103e5e847441b346a4606341203992
 2016-05-06 18:15:35 +00:00
Chris Thornton
57a48eaa15 Merge "Fix NPE in KeyphraseEnrollmentInfo.toString()" into nyc-dev am: 0f6a7abb83 
am: b6dba40c9e

* commit 'b6dba40c9e9926a86236ec9e121e34bf787ba473':
  Fix NPE in KeyphraseEnrollmentInfo.toString()

Change-Id: I274e3ac35cc021131d16357e8b89740988197ca5
 2016-05-06 18:15:35 +00:00
Chris Thornton
6e3449b33f Merge "Fix NPE in KeyphraseEnrollmentInfo.toString()" into nyc-dev 
am: 0f6a7abb83

* commit '0f6a7abb83687e8f800e7754cf585edca725d83e':
  Fix NPE in KeyphraseEnrollmentInfo.toString()

Change-Id: Ieeb8c8eeac89a68ffcbcaf31b7f6d2b8c60dea7d
 2016-05-06 18:10:28 +00:00
Chris Thornton
b6dba40c9e Merge "Fix NPE in KeyphraseEnrollmentInfo.toString()" into nyc-dev 
am: 0f6a7abb83

* commit '0f6a7abb83687e8f800e7754cf585edca725d83e':
  Fix NPE in KeyphraseEnrollmentInfo.toString()

Change-Id: Id6e61a0ef2d51317a749526d132a6c9fb96899fa
 2016-05-06 18:10:23 +00:00
Phil Weaver
b42afe9be0 Merge "Make AccessibilityService#disableSelf atomic." into nyc-dev 2016-05-06 18:08:29 +00:00
Chris Thornton
0f6a7abb83 Merge "Fix NPE in KeyphraseEnrollmentInfo.toString()" into nyc-dev 2016-05-06 18:04:20 +00:00
Hans Boehm
d89abcf16d Merge "Improve grammar in startService() documentation." am: e3a25ad692 am: cc9c83dbd4 am: 1a72cf2e4f 
am: 3bc625a30a

* commit '3bc625a30af39a25a2dec5a5e70fb3fbd38c98ca':
  Improve grammar in startService() documentation.

Change-Id: Id179761ee138cecf7245788735dd3a3e063f9bc0
 2016-05-06 17:51:43 +00:00
Hans Boehm
3bc625a30a Merge "Improve grammar in startService() documentation." am: e3a25ad692 am: cc9c83dbd4 
am: 1a72cf2e4f

* commit '1a72cf2e4f7d94f004979ee140fbe3f17c5e350a':
  Improve grammar in startService() documentation.

Change-Id: Ifd50bd9f2b8c83e657bc6df419e70b30532649d0
 2016-05-06 17:47:23 +00:00
Jorim Jaggi
ec0ca2a9ac Merge "Don\'t crash the system when detecting a transient wrong state am: f970410afe am: ec88030fb9" into nyc-mr1-dev-plus-aosp 
am: 10c8f4c476

* commit '10c8f4c476ed91719be813ee937e2a65a9c07f08':

Change-Id: If153bd8ae0ccb9373d7fb79b9bbcb2ca3efef9df
 2016-05-06 17:46:13 +00:00
Jorim Jaggi
e7ea283796 Merge "Also notify divider when getting DockedTopTaskEvent am: 3273f31c40 am: 878dfb2dea" into nyc-mr1-dev-plus-aosp 
am: 93a67bfcbf

* commit '93a67bfcbf4c7491df31e4c002caf96192f5516b':

Change-Id: Ie0f1ce83a0fbc693898103abf375d15cd0b5ca7c
 2016-05-06 17:46:10 +00:00
Jorim Jaggi
4e0dfee16d Merge "Don\'t crash the system when detecting a transient wrong state am: f970410afe am: 35ad9d867e" into nyc-mr1-dev-plus-aosp 
am: 87a4877c35

* commit '87a4877c35dae54c0e3508717281e4c64cfd9e69':

Change-Id: If7a3eb9a99ab4b1fd489016b5b05e7ba1570af23
 2016-05-06 17:42:02 +00:00
Jorim Jaggi
d2e6ec0c6d Merge "Also notify divider when getting DockedTopTaskEvent am: 3273f31c40 am: 5f95504247" into nyc-mr1-dev-plus-aosp 
am: 54a86e166e

* commit '54a86e166e18aa36d5f76672c0d20b9f19277a61':

Change-Id: I06f30fe9f9cb6a45574c6cc38086d1c8995da0ab
 2016-05-06 17:42:00 +00:00
Jorim Jaggi
1db8593046 Merge "Don\'t crash the system when detecting a transient wrong state am: f970410afe am: ec88030fb9" into nyc-mr1-dev-plus-aosp 
am: 774958f0e1

* commit '774958f0e1bb90a5591f7b6cbe4fab823e1cd687':
  Don't crash the system when detecting a transient wrong state

Change-Id: I1b6604a78fdaf332da8524b38e29118906443a6d
 2016-05-06 17:41:55 +00:00
Jorim Jaggi
1f1746e1c5 Merge "Also notify divider when getting DockedTopTaskEvent am: 3273f31c40 am: 878dfb2dea" into nyc-mr1-dev-plus-aosp 
am: 8dbee5f00a

* commit '8dbee5f00a245125082534da74a7309ddd5e7a2f':
  Also notify divider when getting DockedTopTaskEvent

Change-Id: Ia6113d69a8faee79cc854ac1578efcf6bfb195ef
 2016-05-06 17:41:47 +00:00
Wale Ogunwale
e3bca9b304 Merge "Merge "Fixed bad focus stack state when focused docked stack is removed" into nyc-dev am: 316f67bcfb am: 2079e7c7f6" into nyc-mr1-dev-plus-aosp 
am: 14c1045551

* commit '14c10455514e90188efcce08f62f80ec2786a52f':

Change-Id: I0c3deb90133097ff5c4df3d95bdd06cc4215f0b1
 2016-05-06 17:41:39 +00:00
Wale Ogunwale
d44dbde08d Merge "Merge "Fixed bad focus stack state when focused docked stack is removed" into nyc-dev am: 316f67bcfb am: 2079e7c7f6" into nyc-mr1-dev-plus-aosp 
am: 6e657de7f9

* commit '6e657de7f9349fb158b257b98109d8599cd4c49e':

Change-Id: I27043d6325b47847cfa2c1e17d81f3113d6d9c06
 2016-05-06 17:41:30 +00:00
Hans Boehm
1a72cf2e4f Merge "Improve grammar in startService() documentation." am: e3a25ad692 
am: cc9c83dbd4

* commit 'cc9c83dbd4123cf4677cd351fd0b96d9d04ffbee':
  Improve grammar in startService() documentation.

Change-Id: I7a7296839c0b9ec89002dead994cc346e1969567
 2016-05-06 17:41:18 +00:00
Android Build Merger (Role)
10c8f4c476 Merge "Don\'t crash the system when detecting a transient wrong state am: f970410afe am: ec88030fb9" into nyc-mr1-dev-plus-aosp 2016-05-06 17:37:39 +00:00
Android Build Merger (Role)
93a67bfcbf Merge "Also notify divider when getting DockedTopTaskEvent am: 3273f31c40 am: 878dfb2dea" into nyc-mr1-dev-plus-aosp 2016-05-06 17:37:24 +00:00
Android Build Merger (Role)
87a4877c35 Merge "Don\'t crash the system when detecting a transient wrong state am: f970410afe am: 35ad9d867e" into nyc-mr1-dev-plus-aosp 2016-05-06 17:37:06 +00:00
Android Build Merger (Role)
54a86e166e Merge "Also notify divider when getting DockedTopTaskEvent am: 3273f31c40 am: 5f95504247" into nyc-mr1-dev-plus-aosp 2016-05-06 17:36:51 +00:00
Jorim Jaggi
8e3312acfb Don\'t crash the system when detecting a transient wrong state am: f970410afe 
am: ec88030fb9

* commit 'ec88030fb96b02dd72305d158c2783808b47b7da':
  Don't crash the system when detecting a transient wrong state

Change-Id: I79f80d31d2c0a320cd7fa0972e844c01181409bb
 2016-05-06 17:36:48 +00:00
Jorim Jaggi
64465712eb Also notify divider when getting DockedTopTaskEvent am: 3273f31c40 
am: 878dfb2dea

* commit '878dfb2dea14e311556ef95ccb2914d1106c0449':
  Also notify divider when getting DockedTopTaskEvent

Change-Id: I8be559a443f08faec8156d659ad81e206727cc9d
 2016-05-06 17:36:44 +00:00
Android Build Merger (Role)
c70dc1cc03 Merge "Merge "Fixed bad focus stack state when focused docked stack is removed" into nyc-dev am: 316f67bcfb am: 03507ebdd5 am: cd2db2cda5" 2016-05-06 17:36:39 +00:00
Wale Ogunwale
ad0f544c94 Merge "Fixed bad focus stack state when focused docked stack is removed" into nyc-dev am: 316f67bcfb am: 03507ebdd5 
am: cd2db2cda5

* commit 'cd2db2cda57393db7616e0dd777e3a5f5bc085d0':
  Fixed bad focus stack state when focused docked stack is removed

Change-Id: I1bf61d2b934ccbfb927d2eab1bd8580ac53d7c0b
 2016-05-06 17:36:15 +00:00
Jorim Jaggi
f3691c227e Don\'t crash the system when detecting a transient wrong state am: f970410afe 
am: 35ad9d867e

* commit '35ad9d867e2aeb5ce0731fa1071a128041c7e854':
  Don't crash the system when detecting a transient wrong state

Change-Id: I21934e79486ef9f61546881d7fd0405a0c1a19b9
 2016-05-06 17:36:12 +00:00
Hans Boehm
cc9c83dbd4 Merge "Improve grammar in startService() documentation." 
am: e3a25ad692

* commit 'e3a25ad692cf88455222522542fe374a41024ccf':
  Improve grammar in startService() documentation.

Change-Id: Iaa95eb5d01d45b8352f1eeb0a7f1519b1958ddd4
 2016-05-06 17:36:11 +00:00
Jorim Jaggi
17659904f2 Also notify divider when getting DockedTopTaskEvent am: 3273f31c40 
am: 5f95504247

* commit '5f95504247e30ba261552366f8033e8169b775a0':
  Also notify divider when getting DockedTopTaskEvent

Change-Id: I30a406520ff8a9dfd532176613153c56585006eb
 2016-05-06 17:36:09 +00:00
Android Build Merger (Role)
774958f0e1 Merge "Don\'t crash the system when detecting a transient wrong state am: f970410afe am: ec88030fb9" into nyc-mr1-dev-plus-aosp 2016-05-06 17:35:14 +00:00