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

266854 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chih-Hung Hsieh
56996ff61e resolve merge conflicts of 76ce8e5 to stage-aosp-master am: ed935c32f4 
am: ef57a0d629

Change-Id: Ifcc24ad835f2e74a25954bf3fd7090c75abdc084
 2016-08-12 00:40:25 +00:00
Chih-Hung Hsieh
ef57a0d629 resolve merge conflicts of 76ce8e5 to stage-aosp-master 
am: ed935c32f4

Change-Id: Ibb7415686469d7b15e8dbe0cd04226c4e0cd7d76
 2016-08-12 00:31:29 +00:00
Ruben Brunk
494855abe8 Merge "Include tids in android.util.Process exceptions." into nyc-mr1-dev am: f36d81038a 
am: fbde186842

Change-Id: Ia38c0e464c11fb71bec8793eed15017d6a33356d
 2016-08-12 00:16:40 +00:00
Ruben Brunk
e6446636f9 Include tids in android.util.Process exceptions. am: 4c0c4df7cf 
am: f23fabf54e

Change-Id: I677f5eece0b8ea7c86541766eb6aa8c9f2b7ff94
 2016-08-12 00:16:32 +00:00
Ruben Brunk
fbde186842 Merge "Include tids in android.util.Process exceptions." into nyc-mr1-dev 
am: f36d81038a

Change-Id: Ia3a3ab547f93158dbec22fa89939ec8939a3f6aa
 2016-08-12 00:07:26 +00:00
Ruben Brunk
f23fabf54e Include tids in android.util.Process exceptions. 
am: 4c0c4df7cf

Change-Id: Ic0950e41aaa767e00610a77a57145c4a1bac2c85
 2016-08-12 00:07:24 +00:00
Ruben Brunk
f36d81038a Merge "Include tids in android.util.Process exceptions." into nyc-mr1-dev 2016-08-12 00:00:37 +00:00
Chih-Hung Hsieh
ed935c32f4 resolve merge conflicts of 76ce8e5 to stage-aosp-master 
Change-Id: I4b4ca9906373a95776d2da8ba2fa39a4a78e2a30
 2016-08-11 16:48:46 -07:00
Treehugger Robot
76ce8e5242 Merge "Fix clang-tidy warnings in libs/hwui." 2016-08-11 23:20:47 +00:00
Jakub Pawlowski
ecd10beefd resolve merge conflicts of 5671277 to stage-aosp-master am: 5aa4ba3776 
am: 84b61fb4b0

Change-Id: Id1dc84ba248e6d91bcab28f94b9c2b29dc16787d
 2016-08-11 23:11:19 +00:00
Jakub Pawlowski
84b61fb4b0 resolve merge conflicts of 5671277 to stage-aosp-master 
am: 5aa4ba3776

Change-Id: Id0926a640dd15d33d6df9582009d587d7bed1872
 2016-08-11 23:05:49 +00:00
Jakub Pawlowski
5aa4ba3776 resolve merge conflicts of 5671277 to stage-aosp-master 
Change-Id: I71e3bd497dbdc0b3f297ad311620aa77bf7225ac
 2016-08-11 15:53:06 -07:00
Jakub Pawlowski
5671277d2a Merge "Add LE Secure Connection data parsing (1/4)" 2016-08-11 22:32:23 +00:00
Jakub Pawlowski
747711ce9b Add LE Secure Connection data parsing (1/4) 
Bug: 30460956
Change-Id: I8d6e721b3b04f5ca9e3e02f7f2b90487482e1b37
 2016-08-11 22:18:19 +00:00
Amith Yamasani
1727db3961 Merge "Clean up when recycling a pid with a pending launch" into nyc-mr1-dev am: 792aaab77a 
am: c76f8c1b55

Change-Id: If18b8d2947a1bcddeda6f3cc7c74b8ce7ea536f5
 2016-08-11 21:19:53 +00:00
Amith Yamasani
1fa3fd30bd Clean up when recycling a pid with a pending launch am: d86e14e45c 
am: 92de60bd7f

Change-Id: Iedb5153b37f8e240b545c97b99248a18e9f8613e
 2016-08-11 21:19:49 +00:00
Wale Ogunwale
57d2fbce83 Merge changes Ide94af72,Ie2c94439 into nyc-mr1-dev am: efa21a9924 
am: 70d32b3d22

Change-Id: I7b235a555e585900e7949f79757d7555e277270d
 2016-08-11 21:19:45 +00:00
Wale Ogunwale
440890193f Clear WS.mDestroying on AWT.clearAnimatingFlags am: 3c0d44e633 
am: 5d132bf021

Change-Id: I637742001089d128a22762411b35b5973dd604ae
 2016-08-11 21:19:10 +00:00
Chong Zhang
867d9569df Some fixes for transition animation selection am: 808621ca54 
am: 3d2acc1ab6

Change-Id: I0158f63b4ad154aabe0a53a8b8030ab914f76c29
 2016-08-11 21:18:37 +00:00
Amith Yamasani
c76f8c1b55 Merge "Clean up when recycling a pid with a pending launch" into nyc-mr1-dev 
am: 792aaab77a

Change-Id: I908d6adb238d47b42f4c756e07ec1d0ac137f8d5
 2016-08-11 21:06:23 +00:00
Amith Yamasani
92de60bd7f Clean up when recycling a pid with a pending launch 
am: d86e14e45c

Change-Id: If77af8cc8a0b9620c2fc5e4704c178667fc0703e
 2016-08-11 21:05:51 +00:00
Wale Ogunwale
70d32b3d22 Merge changes Ide94af72,Ie2c94439 into nyc-mr1-dev 
am: efa21a9924

Change-Id: I540bf405007052af240d58a4e390cbbbda9011e8
 2016-08-11 21:05:48 +00:00
Wale Ogunwale
5d132bf021 Clear WS.mDestroying on AWT.clearAnimatingFlags 
am: 3c0d44e633

Change-Id: I7188dc89d20ee7d96f99e0116cef0eaa4b1bcc4e
 2016-08-11 21:05:45 +00:00
Chong Zhang
3d2acc1ab6 Some fixes for transition animation selection 
am: 808621ca54

Change-Id: I9ded235ab5d8942ba66e4dbcb769169565eb4304
 2016-08-11 21:05:17 +00:00
Phil Weaver
807eb48292 Merge "Limit capabilities of a11y gesture dispatch." into nyc-mr1-dev am: 364580d20a 
am: f933858b07

Change-Id: I22e571503489cd6300a9f475a3faca58da528883
 2016-08-11 21:04:01 +00:00
Phil Weaver
3d40beacfd Limit capabilities of a11y gesture dispatch. am: a8918f23c7 
am: 0e97bb6c1a

Change-Id: Ibb5b330e3ffe8530c6a506311146bc3597bd512b
 2016-08-11 21:03:28 +00:00
Phil Weaver
cdcb846081 Merge "Don't preserve a11y focus in hierarchy state." into nyc-mr1-dev am: aefa892035 
am: 4e1d6f439a

Change-Id: Id2fbc3ae31e60d2940be6c9fbf01147f5d3d376d
 2016-08-11 21:03:22 +00:00
Phil Weaver
99633b3700 Don't preserve a11y focus in hierarchy state. am: f40ee509c6 
am: 711d7260ba

Change-Id: I7b2f1b2955c279f21f8f7a5ffc7b615ddaa50ff5
 2016-08-11 21:03:19 +00:00
Chong Zhang
fd553e523d Merge "Dump out last real used app transit type" into nyc-mr1-dev am: b1dfc3e7e1 
am: c88f140ee4

Change-Id: I7889b6239c319d5f5d456c383e659b56796376e5
 2016-08-11 20:55:17 +00:00
Chong Zhang
5222f440b0 Dump out last real used app transit type am: 60091a978f 
am: 3d2bf37da1

Change-Id: Ia31640768df6a5fb05efaa4307066e7dd8c461af
 2016-08-11 20:55:12 +00:00
Phil Weaver
f933858b07 Merge "Limit capabilities of a11y gesture dispatch." into nyc-mr1-dev 
am: 364580d20a

Change-Id: I84aef92197ee41a92351a32df7326fd91801e8f3
 2016-08-11 20:53:47 +00:00
Phil Weaver
0e97bb6c1a Limit capabilities of a11y gesture dispatch. 
am: a8918f23c7

Change-Id: I8c14c8b8ada7e7c53b17be2df63c14c4e0e10c83
 2016-08-11 20:53:44 +00:00
Phil Weaver
4e1d6f439a Merge "Don't preserve a11y focus in hierarchy state." into nyc-mr1-dev 
am: aefa892035

Change-Id: Ic2403a6e01ee7e35bc364b2f8fec5f4fcc37a24f
 2016-08-11 20:53:40 +00:00
Phil Weaver
711d7260ba Don't preserve a11y focus in hierarchy state. 
am: f40ee509c6

Change-Id: I14ba7354058eef6942286483b3f61ea0404135ea
 2016-08-11 20:53:37 +00:00
Amith Yamasani
792aaab77a Merge "Clean up when recycling a pid with a pending launch" into nyc-mr1-dev 2016-08-11 20:48:27 +00:00
Wale Ogunwale
efa21a9924 Merge changes Ide94af72,Ie2c94439 into nyc-mr1-dev 
* changes:
  Clear WS.mDestroying on AWT.clearAnimatingFlags
  Some fixes for transition animation selection
 2016-08-11 20:43:28 +00:00
Chong Zhang
c88f140ee4 Merge "Dump out last real used app transit type" into nyc-mr1-dev 
am: b1dfc3e7e1

Change-Id: Iaab588bf3527920b754a2b8815d3d99ba3ce5cf7
 2016-08-11 20:43:28 +00:00
Chong Zhang
3d2bf37da1 Dump out last real used app transit type 
am: 60091a978f

Change-Id: Iafeb1d21ab90c9ea124bfb6911abc1ad9165895d
 2016-08-11 20:43:27 +00:00
Chris Tate
338d0e07b6 Merge "Check system & lock wallpaper backup eligibility independently" into nyc-mr1-dev am: dd59a27f2e 
am: 949afd5eaf

Change-Id: I25f687dc7d87efd1da1bac45722b5581b0fe0683
 2016-08-11 20:35:48 +00:00
Christopher Tate
9649aecab6 Check system & lock wallpaper backup eligibility independently am: 6172266154 
am: 611afaf4ae

Change-Id: I5d8361f2854647fae86847828d58154af06618c8
 2016-08-11 20:35:43 +00:00
Phil Weaver
364580d20a Merge "Limit capabilities of a11y gesture dispatch." into nyc-mr1-dev 2016-08-11 20:35:12 +00:00
Phil Weaver
aefa892035 Merge "Don't preserve a11y focus in hierarchy state." into nyc-mr1-dev 2016-08-11 20:34:42 +00:00
TreeHugger Robot
b1dfc3e7e1 Merge "Dump out last real used app transit type" into nyc-mr1-dev 2016-08-11 20:29:43 +00:00
Chris Tate
949afd5eaf Merge "Check system & lock wallpaper backup eligibility independently" into nyc-mr1-dev 
am: dd59a27f2e

Change-Id: I9b1f2951d80832182afb11e87a9e56acb80a302b
 2016-08-11 20:28:48 +00:00
Christopher Tate
611afaf4ae Check system & lock wallpaper backup eligibility independently 
am: 6172266154

Change-Id: I1bfe06d10c1a68b23d4ba8cb4648099f482a22e5
 2016-08-11 20:28:44 +00:00
Chris Tate
dd59a27f2e Merge "Check system & lock wallpaper backup eligibility independently" into nyc-mr1-dev 2016-08-11 20:20:09 +00:00
Esteban Talavera
5d8bd029a8 Merge "Do not toggle OEM unlock if bootloader unlocked" into nyc-mr1-dev am: fd97e7bc8c 
am: 5c96b0d1ab

Change-Id: Idbb8416e0f3e20e57568a5e3d0f2cb7a202f7742
 2016-08-11 19:00:40 +00:00
Esteban Talavera
b9bef2fb7d Do not toggle OEM unlock if bootloader unlocked am: c48b20f8f1 
am: 83583bd596

Change-Id: Ib8293a02ca13587154133a939c4515de1a114bd9
 2016-08-11 19:00:37 +00:00
Esteban Talavera
5c96b0d1ab Merge "Do not toggle OEM unlock if bootloader unlocked" into nyc-mr1-dev 
am: fd97e7bc8c

Change-Id: I383fd638d92e62a1a83d91c2088b78c6fd4bba3f
 2016-08-11 18:54:17 +00:00
Esteban Talavera
83583bd596 Do not toggle OEM unlock if bootloader unlocked 
am: c48b20f8f1

Change-Id: Ic42a52cc9d71aa1192de0a052efb23a625673232
 2016-08-11 18:54:14 +00:00