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

299746 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
66b9d4486a Revert "try to stop using exotic clipps" 
This reverts commit 834653bcf80a3879c4d80004469053f205d45b69.

Change-Id: Ie8cb787490832a0be154ec1263313982157faa81
 2016-12-16 17:49:48 +00:00
Mike Reed
834653bcf8 try to stop using exotic clipps 
Change-Id: Id11d7744daa69c19fdc9b7723862b3d71ad21384
 2016-12-15 16:01:42 -05:00
TreeHugger Robot
94b5c92a35 Merge "SkClipOp is now an enum class" 2016-12-14 18:29:58 +00:00
Android Build Merger (Role)
6b45e658c3 Merge "DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours am: 495aa09cc6 -s ours am: 10a9005003 -s ours am: 03c946e06b -s ours am: c2aed112a7 -s ours am: 323f2dbc46 -s ours am: d8a6e8eaa2 -s ours" 2016-12-14 18:28:51 +00:00
Julius D'souza
b12f654aac DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours am: 495aa09cc6 -s ours am: 10a9005003 -s ours am: 03c946e06b -s ours am: c2aed112a7 -s ours am: 323f2dbc46 -s ours 
am: d8a6e8eaa2  -s ours

Change-Id: I5a3cef0a83ccafa5983ad132a64023d7f8af1ef3
 2016-12-14 18:28:05 +00:00
Wyatt Riley
95a310dbdf Merge "Restoring Network Available Notification to AGnssRil" 2016-12-14 18:25:23 +00:00
Julius D'souza
d8a6e8eaa2 DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours am: 495aa09cc6 -s ours am: 10a9005003 -s ours am: 03c946e06b -s ours am: c2aed112a7 -s ours 
am: 323f2dbc46  -s ours

Change-Id: Iec1380282c06bbe970c5e178143dede6939b8b0a
 2016-12-14 18:21:23 +00:00
Julius D'souza
323f2dbc46 DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours am: 495aa09cc6 -s ours am: 10a9005003 -s ours am: 03c946e06b -s ours 
am: c2aed112a7  -s ours

Change-Id: Iac7c7e89a57c9e8717aa2fe9012b76595acbb2ea
 2016-12-14 18:15:28 +00:00
Julius D'souza
c2aed112a7 DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours am: 495aa09cc6 -s ours am: 10a9005003 -s ours 
am: 03c946e06b  -s ours

Change-Id: I75323469d9e15ea3b8652bb5f972d0e14a06cc7a
 2016-12-14 18:09:25 +00:00
Julius D'souza
03c946e06b DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours am: 495aa09cc6 -s ours 
am: 10a9005003  -s ours

Change-Id: I7a1d2d5b60b27765b2381e6d85fd3f8e967a40e1
 2016-12-14 18:03:26 +00:00
Chris Craik
15589c36d7 Merge "Outline & Path perf improvements" 2016-12-14 18:03:22 +00:00
Julius D'souza
10a9005003 DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours 
am: 495aa09cc6  -s ours

Change-Id: I0f1a50fac9a6fc8a5c21b890aaa3aea5ea2aca74
 2016-12-14 17:56:53 +00:00
Julius D'souza
495aa09cc6 DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours 
am: 589f83e686  -s ours

Change-Id: I76a619ed9824174735d0a86c55fe13a3d6e90ec5
 2016-12-14 17:51:28 +00:00
Julius D'souza
589f83e686 DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. 
am: f9f39cc4a8  -s ours

Change-Id: Ibd0b18a9e833afcc85845f4db57a927e80739cc2
 2016-12-14 17:44:27 +00:00
Sergei Vasilinetc
82f8f3e04e Merge "Prohibit Config.HARDWARE in factory methods, that create mutable bitmaps" 2016-12-14 17:40:49 +00:00
Marco Nelissen
d194a782ba Merge "Revert "Remove AmrInputStream"" am: e2d8581529 am: 01cb199bed am: 8b1eed4ee8 
am: 10cb330d3e

Change-Id: I5c97e47ff9a5f193645660c195ddd707b86ad025
 2016-12-14 17:19:46 +00:00
TreeHugger Robot
9112c16e16 Merge "Adding public API for marking nodes as clusters and sections." 2016-12-14 17:17:35 +00:00
John Reck
713d153146 Merge "Delete dead code" 2016-12-14 17:16:44 +00:00
Derek Sollenberger
3eda170b77 Merge "Remove Rasterizer and its subclasses from the public API." 2016-12-14 17:16:04 +00:00
Marco Nelissen
10cb330d3e Merge "Revert "Remove AmrInputStream"" am: e2d8581529 am: 01cb199bed 
am: 8b1eed4ee8

Change-Id: Iab40a083d9d0d2c9d4359be25e88d25f8fdc12aa
 2016-12-14 17:12:59 +00:00
Stefan Kuhne
58eea91f9d Merge "Fixing timeout caused by non executed animation" 2016-12-14 17:10:17 +00:00
Marco Nelissen
8b1eed4ee8 Merge "Revert "Remove AmrInputStream"" am: e2d8581529 
am: 01cb199bed

Change-Id: Icafcabcc2b99dac4d897e0d68725c53e84fdd5c5
 2016-12-14 17:05:59 +00:00
Marco Nelissen
01cb199bed Merge "Revert "Remove AmrInputStream"" 
am: e2d8581529

Change-Id: I55615b328bedf67819d076ccb21b9bc1f13a07a8
 2016-12-14 16:59:23 +00:00
Marco Nelissen
e2d8581529 Merge "Revert "Remove AmrInputStream"" 2016-12-14 16:44:47 +00:00
Marco Nelissen
a4efbf863b Revert "Remove AmrInputStream" 
This reverts commit 0c3518cc7724df29b790d9d81af9a105e7958cf7.

Change-Id: I250d86d2d6ce462cb5f29bc6c312d88a49ac24a4
 2016-12-14 16:44:12 +00:00
Mike Reed
6c67f1d045 SkClipOp is now an enum class 
Change-Id: If423dd013a264162ae0b7674a0eeef34bc2cdaae
 2016-12-14 10:29:54 -05:00
Paul Duffin
dc73fc06e0 Merge "Copy core-junit files into legacy-test." am: 69e363f506 am: 884d3ca53b am: b5f056068d 
am: 44da75ebc3

Change-Id: Ibc0b1b7b432cc6357efac907258e4066aef6394a
 2016-12-14 15:23:53 +00:00
Paul Duffin
bf46e6b2e1 Copy core-junit files into legacy-test. am: cd7c34d8bf am: 98e609d556 am: c3650beee5 
am: e9be5d908d

Change-Id: I826ea0752c64b39f3cb9c96a6a33c0f2c4fad98b
 2016-12-14 15:22:43 +00:00
Paul Duffin
44da75ebc3 Merge "Copy core-junit files into legacy-test." am: 69e363f506 am: 884d3ca53b 
am: b5f056068d

Change-Id: Ib5f9f0744dbb610210394264d088df0db8b05988
 2016-12-14 15:16:51 +00:00
Paul Duffin
e9be5d908d Copy core-junit files into legacy-test. am: cd7c34d8bf am: 98e609d556 
am: c3650beee5

Change-Id: I04560b5982651d175a268056f32eb36980ef2259
 2016-12-14 15:15:51 +00:00
Paul Duffin
b5f056068d Merge "Copy core-junit files into legacy-test." am: 69e363f506 
am: 884d3ca53b

Change-Id: I6d4a760fc740620578f324de6f847a3ec59600d5
 2016-12-14 15:10:30 +00:00
Paul Duffin
c3650beee5 Copy core-junit files into legacy-test. am: cd7c34d8bf 
am: 98e609d556

Change-Id: I4eb422f8fe217e5528e632d1f85c1303604b0d64
 2016-12-14 15:09:22 +00:00
Paul Duffin
884d3ca53b Merge "Copy core-junit files into legacy-test." 
am: 69e363f506

Change-Id: I95f3c2005e87f86f7014f6bf693eae7212f54a73
 2016-12-14 15:02:20 +00:00
Paul Duffin
98e609d556 Copy core-junit files into legacy-test. 
am: cd7c34d8bf

Change-Id: I672fa4b006b04db5a4c8f86793f1c891bc55754a
 2016-12-14 15:02:16 +00:00
Paul Duffin
69e363f506 Merge "Copy core-junit files into legacy-test." 2016-12-14 14:50:55 +00:00
Paul Duffin
cd7c34d8bf Copy core-junit files into legacy-test. 
The legacy-test directory contains part of the Android API and
so must maintain backwards compatibility. The junit classes that
are in the API are copied here to ensure that they do not change
when external/junit is upgraded.

Bug: 30188076
Test: make checkbuild and checked legacy-test contents
Change-Id: I6c263afc16c06abfd027334be51a41422239a189
 2016-12-14 14:19:08 +00:00
Julia Reynolds
9ed3a080e8 Merge "DND string change." 2016-12-14 14:11:22 +00:00
Paul Duffin
c8d43bdcb5 Merge "Copy junit-runner files into test-runner." am: 3e24af3eb7 am: 5d53a925a1 am: 49a848e46f 
am: 61a967a3f0

Change-Id: Icfee21339efb024559ce01ab54c44dd76f3fa830
 2016-12-14 14:00:12 +00:00
Paul Duffin
ed7d67a920 Copy junit-runner files into test-runner. am: eef35dd29a am: b46cecb6c4 am: b6421ce031 
am: 50c1bb82b1

Change-Id: I7be2758511183480d9ba948ed1e0958e2e7a97c5
 2016-12-14 13:56:44 +00:00
Paul Duffin
61a967a3f0 Merge "Copy junit-runner files into test-runner." am: 3e24af3eb7 am: 5d53a925a1 
am: 49a848e46f

Change-Id: I92dee395822461470a5cf83d9bb63ba6ff2469c5
 2016-12-14 13:47:09 +00:00
Paul Duffin
50c1bb82b1 Copy junit-runner files into test-runner. am: eef35dd29a am: b46cecb6c4 
am: b6421ce031

Change-Id: I00457223985f4ada91ca9df97bb24fe957de1b24
 2016-12-14 13:43:45 +00:00
Paul Duffin
49a848e46f Merge "Copy junit-runner files into test-runner." am: 3e24af3eb7 
am: 5d53a925a1

Change-Id: I9239d238e51c61c6646022f64917348af27179ab
 2016-12-14 13:40:03 +00:00
Paul Duffin
b6421ce031 Copy junit-runner files into test-runner. am: eef35dd29a 
am: b46cecb6c4

Change-Id: I8f75a351d8e697b2fdbc4e1b3d06fd4ea25ffb0a
 2016-12-14 13:36:38 +00:00
Paul Duffin
5d53a925a1 Merge "Copy junit-runner files into test-runner." 
am: 3e24af3eb7

Change-Id: I55ec07039052bf6030a16bfa0cbeedc8690809f7
 2016-12-14 13:35:44 +00:00
Paul Duffin
b46cecb6c4 Copy junit-runner files into test-runner. 
am: eef35dd29a

Change-Id: I974279917ae3451abf44143161ac945f4153768f
 2016-12-14 13:30:03 +00:00
Paul Duffin
3e24af3eb7 Merge "Copy junit-runner files into test-runner." 2016-12-14 13:22:40 +00:00
Erik Kline
c30cdf89fe Merge "More correct startup and shutdown procedures." into nyc-mr2-dev am: c8059fb94c 
am: 208336e710

Change-Id: I1385649a71bdba3f19fd863bd4a3ace66d56b568
 2016-12-14 11:47:22 +00:00
Erik Kline
fdce10985c More correct startup and shutdown procedures. am: 6c0782f1ae 
am: 20cad0821d

Change-Id: I5096f6a6f3d42bd55b9d3c80e279f2ee2fb0a795
 2016-12-14 11:46:26 +00:00
Michal Karpinski
e093a98925 Merge "Fix javadoc for PackageManager#getNameForUid()" 2016-12-14 11:44:02 +00:00
Erik Kline
208336e710 Merge "More correct startup and shutdown procedures." into nyc-mr2-dev 
am: c8059fb94c

Change-Id: Ib017af2b267689c0833b92c13f29da1d2e69a011
 2016-12-14 11:39:44 +00:00