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

262459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Wiley
07630f6bd3 Create frameworks-base-testutils lib 
This permits sharing of test components used in connectivity tests.
Rename the MockLooper to TestLooper, reflecting that it is not a
true mock, but a manually controlled Looper for use in tests.

Bug: 28848133
Test: Tests consuming this library pass.

Change-Id: I57e11f9544c7bffdb02739ab2a921512b1b11874
 2016-05-19 13:12:09 -07:00
Ian Rogers
63f289a8a1 Merge "Fix bug where FileUtils.deleteOlderFiles wouldn't delete the oldest files." 2016-05-19 16:59:10 +00:00
TreeHugger Robot
80468ad83f Merge "Move android.net.util.IpUtilsTest into a util/ directory" 2016-05-19 16:56:06 +00:00
Michael Wright
f3201c3911 Merge "Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev am: a1e0cebf3a am: ce290a75f2" into nyc-mr1-dev-plus-aosp 
am: aad6acaf6d  -s ours

* commit 'aad6acaf6dcdc00abf12f5759c1a8d446e89f55e':

Change-Id: I468712ca8526c6624eaa2d620cfbd52dc9820d6f
 2016-05-19 15:35:01 +00:00
Michael Wright
367da1fbd7 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev am: a1e0cebf3a am: 1831ca8f04 
am: 5d2ea237d4  -s ours

* commit '5d2ea237d428974be25e09ab9e11578cbf3bbc90':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: I1f372c46e38f32cc6f7729c45fc385dead9b4434
 2016-05-19 15:27:15 +00:00
Android Build Merger (Role)
aad6acaf6d Merge "Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev am: a1e0cebf3a am: ce290a75f2" into nyc-mr1-dev-plus-aosp 2016-05-19 15:24:45 +00:00
Michael Wright
d308e46354 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev am: a1e0cebf3a 
am: ce290a75f2

* commit 'ce290a75f26e3b9c6e2875ba1fcef65020984b7e':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: I8df44a8cbc687f81639cb061fb6739a813f0c386
 2016-05-19 15:23:58 +00:00
Michael Wright
5d2ea237d4 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev am: a1e0cebf3a 
am: 1831ca8f04

* commit '1831ca8f04e117a49227e1b3dc0c8ba1dde06cd5':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: Iebfbc1de1bbf2f86e62ed2105c30e89239368b11
 2016-05-19 15:23:45 +00:00
Michael Wright
1831ca8f04 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 
am: a1e0cebf3a

* commit 'a1e0cebf3a18ac097d370e21d698e079f974bfff':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: I20532a3148a99d4ea91ba7dc050f8669d5f19400
 2016-05-19 15:12:30 +00:00
Michael Wright
ce290a75f2 Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 
am: a1e0cebf3a

* commit 'a1e0cebf3a18ac097d370e21d698e079f974bfff':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: I03543851263b7e9e2f84b179d66d3d269c48bf6c
 2016-05-19 15:12:29 +00:00
TreeHugger Robot
a1e0cebf3a Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 2016-05-19 15:03:36 +00:00
Matt Sarett
db4773f0df Correct rowBytes on SkBitmap to match recycled bitmap sooner 
This will prevent us from triggering asserts when we
call lockPixels().

skbug.com/4538

Change-Id: Ibcd18818e33ccbacdcdfa57e822b04dd91b6af17
 2016-05-19 13:28:50 +00:00
Clara Bayarri
5210974cf5 Merge "Add Tron Logging to Keyboard Shortcuts Helper" 2016-05-19 09:19:32 +00:00
TreeHugger Robot
56c776dbd1 Merge "Clean up class members in Tethering.TetherInterfaceSM" 2016-05-19 08:49:24 +00:00
Andrii Kulian
d6868fa1ca Merge "Merge "Workaround for ignored resizeableActivity param" into nyc-dev am: 005f9a73fb am: ede05733f0" into nyc-mr1-dev-plus-aosp 
am: 073466ea8a

* commit '073466ea8a25a94327f7d9e7a2cf9dd858d8d626':

Change-Id: Ib9bf553be08ac9c31d521f57c9b31543f3d76f3e
 2016-05-19 08:18:16 +00:00
Andrii Kulian
5a3ff14225 Merge "Workaround for ignored resizeableActivity param" into nyc-dev am: 005f9a73fb am: 6b21f45add 
am: e78cbe1770

* commit 'e78cbe1770ffee7d9f24c8f1126fb1592c9ad1c3':
  Workaround for ignored resizeableActivity param

Change-Id: I36d934ec2aea69156680d9b9e55584ce12d76b60
 2016-05-19 08:12:56 +00:00
Android Build Merger (Role)
073466ea8a Merge "Merge "Workaround for ignored resizeableActivity param" into nyc-dev am: 005f9a73fb am: ede05733f0" into nyc-mr1-dev-plus-aosp 2016-05-19 08:09:38 +00:00
Andrii Kulian
4578ef4e63 Merge "Workaround for ignored resizeableActivity param" into nyc-dev am: 005f9a73fb 
am: ede05733f0

* commit 'ede05733f0c02f16324b71311397db5e680f607b':
  Workaround for ignored resizeableActivity param

Change-Id: I81ee6a65b44b9f8f099842619d3548fb64c4c403
 2016-05-19 08:09:10 +00:00
Andrii Kulian
e78cbe1770 Merge "Workaround for ignored resizeableActivity param" into nyc-dev am: 005f9a73fb 
am: 6b21f45add

* commit '6b21f45add49cdacaad9e75cbba332fa3b63522c':
  Workaround for ignored resizeableActivity param

Change-Id: Ia8dc3606ff13b1358d657a8280820ed542cb4781
 2016-05-19 08:09:07 +00:00
Andrii Kulian
6b21f45add Merge "Workaround for ignored resizeableActivity param" into nyc-dev 
am: 005f9a73fb

* commit '005f9a73fbecdb8d0d05eb699d0f02d745110495':
  Workaround for ignored resizeableActivity param

Change-Id: Ia524867cac9118b6dbe5c7c210cd1a1753fe53e1
 2016-05-19 08:06:02 +00:00
Andrii Kulian
ede05733f0 Merge "Workaround for ignored resizeableActivity param" into nyc-dev 
am: 005f9a73fb

* commit '005f9a73fbecdb8d0d05eb699d0f02d745110495':
  Workaround for ignored resizeableActivity param

Change-Id: I93844e807cbedc50b26f98916fe3e79e0ef9afa2
 2016-05-19 08:06:02 +00:00
Andrii Kulian
005f9a73fb Merge "Workaround for ignored resizeableActivity param" into nyc-dev 2016-05-19 07:57:20 +00:00
Andrii Kulian
a8a47ce691 Merge "Merge "Fix build breakage caused by redefining attrs" into nyc-dev am: fa020a8094 am: 475ab2be5c" into nyc-mr1-dev-plus-aosp 
am: 6639e2fc3a

* commit '6639e2fc3abb3504f2439a1b0b0997b299975104':

Change-Id: I0092cb12ff7edaa1cee843cf925116d29d5f33dc
 2016-05-19 07:26:50 +00:00
Andrii Kulian
ae2a0e0918 Merge "Fix build breakage caused by redefining attrs" into nyc-dev am: fa020a8094 am: 1b9a930ba4 
am: 38e3b3ba91

* commit '38e3b3ba91947180c6939e635e9a24fe693d736d':
  Fix build breakage caused by redefining attrs

Change-Id: If6fc6cae40fffcbd3d968efdea3715f7c7255030
 2016-05-19 07:20:59 +00:00
Android Build Merger (Role)
6639e2fc3a Merge "Merge "Fix build breakage caused by redefining attrs" into nyc-dev am: fa020a8094 am: 475ab2be5c" into nyc-mr1-dev-plus-aosp 2016-05-19 07:18:35 +00:00
Andrii Kulian
c6e533e90d Merge "Fix build breakage caused by redefining attrs" into nyc-dev am: fa020a8094 
am: 475ab2be5c

* commit '475ab2be5c5c2f0cf4fd4ce863a98473f7fbbd0a':
  Fix build breakage caused by redefining attrs

Change-Id: I9c6ef99d1bd7b4affeee500dc6a1b0eca1b84b5b
 2016-05-19 07:18:02 +00:00
Andrii Kulian
38e3b3ba91 Merge "Fix build breakage caused by redefining attrs" into nyc-dev am: fa020a8094 
am: 1b9a930ba4

* commit '1b9a930ba4a5884b01b9ebf6b92065a55c689dec':
  Fix build breakage caused by redefining attrs

Change-Id: Iae28ff991e2dc154db009f75da45f7aa25ada5d2
 2016-05-19 07:17:57 +00:00
Andrii Kulian
1b9a930ba4 Merge "Fix build breakage caused by redefining attrs" into nyc-dev 
am: fa020a8094

* commit 'fa020a8094a08b5a26735c33c4ddaadcb51f99fc':
  Fix build breakage caused by redefining attrs

Change-Id: Id3502d67601e6a4348326c7eeb83de39dfd368b6
 2016-05-19 07:15:03 +00:00
Andrii Kulian
475ab2be5c Merge "Fix build breakage caused by redefining attrs" into nyc-dev 
am: fa020a8094

* commit 'fa020a8094a08b5a26735c33c4ddaadcb51f99fc':
  Fix build breakage caused by redefining attrs

Change-Id: I0663ec408eec497c64c35a9c7d6f43e223c3cc22
 2016-05-19 07:15:01 +00:00
TreeHugger Robot
fa020a8094 Merge "Fix build breakage caused by redefining attrs" into nyc-dev 2016-05-19 07:06:50 +00:00
Andrii Kulian
bd17d8c63b Fix build breakage caused by redefining attrs 
minWidth and minHeight were already defined without format specified
and we need to have definition without format also. Otherwise they conflict.

Bug: 28775586
Change-Id: I0602bd70d03bdacfc604d884951a60871159ed92
 2016-05-18 22:35:19 -07:00
Ian Rogers
f5e2e9756e Merge "Fix 2 instances of buggy double check locking on non-volatile fields." 2016-05-19 05:19:29 +00:00
Erik Kline
5f4f5a70ed Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: c21f84dddb am: ae53fb4a43 
am: 03307df369

* commit '03307df369e87f737a3f0086de0c6f0081b65719':

Change-Id: Id5a57f95fcf00474fb14569c66a8bdd4a7b2d903
 2016-05-19 04:34:18 +00:00
Erik Kline
f26088c8c2 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: c21f84dddb am: 8958153ac7 
am: f99efa7e75

* commit 'f99efa7e758e00101fbc19be68b8552a946c21a3':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: I4a0be195dab4525258b455330ce6212987b0e6c0
 2016-05-19 04:27:26 +00:00
Erik Kline
03307df369 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: c21f84dddb 
am: ae53fb4a43

* commit 'ae53fb4a436bcbb7deea668a26d2ba66bb4c5af3':

Change-Id: Id68aa8f81f11042c7583fad42da2063cbb17efe1
 2016-05-19 04:27:24 +00:00
Erik Kline
f99efa7e75 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev am: c21f84dddb 
am: 8958153ac7

* commit '8958153ac7921349dd8770a33484ca96581277cc':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: I314ceed6380af58fb3f6308dde11f2d29b324c66
 2016-05-19 04:24:16 +00:00
Erik Kline
ae53fb4a43 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev 
am: c21f84dddb

* commit 'c21f84dddbe8144bb3d392b3b91c6df5f48aed42':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: Ic99edb732d532da27c042824e5ca07c4b35ccfa1
 2016-05-19 04:21:17 +00:00
Erik Kline
8958153ac7 Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev 
am: c21f84dddb

* commit 'c21f84dddbe8144bb3d392b3b91c6df5f48aed42':
  DHCPv4: lease expiration is fatal, renew failures are not

Change-Id: I10ed64f309794ed7a18e16f22fa75bc63707998c
 2016-05-19 04:21:15 +00:00
Erik Kline
c21f84dddb Merge "DHCPv4: lease expiration is fatal, renew failures are not" into nyc-dev 2016-05-19 04:12:40 +00:00
Andreas Gampe
8769a8dd5f Merge "Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev am: 8cb3b2bb5c am: fcbc43b70a" into nyc-mr1-dev-plus-aosp 
am: 8636c71df6

* commit '8636c71df636633c5d74a4ca4046d302d3167111':

Change-Id: Icb31a9fc18cf75f824bdc41ff62cf3e1686eea87
 2016-05-19 04:00:20 +00:00
Andreas Gampe
059db73b1f Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev am: 8cb3b2bb5c am: 3fbf298984 
am: 36061b85ff

* commit '36061b85ff3776c4df57b1ea42c7059234585be7':
  Frameworks/base: Optimize LoadedApk

Change-Id: I894cf7dc97eaa6ddaec758cb7731803e173209ca
 2016-05-19 04:00:15 +00:00
Android Build Merger (Role)
8636c71df6 Merge "Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev am: 8cb3b2bb5c am: fcbc43b70a" into nyc-mr1-dev-plus-aosp 2016-05-19 03:55:51 +00:00
Andreas Gampe
16673d6849 Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev am: 8cb3b2bb5c 
am: fcbc43b70a

* commit 'fcbc43b70a8c441f438020574a73550e0d1c7e6c':
  Frameworks/base: Optimize LoadedApk

Change-Id: I1fe3dd5240dbff0f73592538eb1b2af7b569eb1b
 2016-05-19 03:55:19 +00:00
Andreas Gampe
36061b85ff Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev am: 8cb3b2bb5c 
am: 3fbf298984

* commit '3fbf29898459d3b6d9fa1680c02650fd692c32e6':
  Frameworks/base: Optimize LoadedApk

Change-Id: Id57874836bd9a4e13b57cad2fdc1ff28d6a8f19c
 2016-05-19 03:55:17 +00:00
Andreas Gampe
3fbf298984 Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev 
am: 8cb3b2bb5c

* commit '8cb3b2bb5c49322cef07931a0ee14c99da5e4b0b':
  Frameworks/base: Optimize LoadedApk

Change-Id: Id11e7e9114403ab70c83601f1988f098d5728a5b
 2016-05-19 03:51:39 +00:00
Andreas Gampe
fcbc43b70a Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev 
am: 8cb3b2bb5c

* commit '8cb3b2bb5c49322cef07931a0ee14c99da5e4b0b':
  Frameworks/base: Optimize LoadedApk

Change-Id: I3cefc230805bc11051acbf3b92382be2aa8dd273
 2016-05-19 03:51:37 +00:00
TreeHugger Robot
8cb3b2bb5c Merge "Frameworks/base: Optimize LoadedApk" into nyc-dev 2016-05-19 03:43:08 +00:00
Ian Rogers
4509b940fb Fix 2 instances of buggy double check locking on non-volatile fields. 
Bug caught by Error Prone:
http://errorprone.info/bugpattern/DoubleCheckedLocking

Bug: 27723540
Change-Id: I0b0c06ce4ae1ffb668e8ab3a7fe07706df173f18
 2016-05-18 20:04:13 -07:00
Andrii Kulian
e4ce27a277 Merge "Merge "Update docs for minWidth/minHeight attributes" into nyc-dev am: 13778161ea am: ba15163b2a" into nyc-mr1-dev-plus-aosp 
am: dc88bfa430

* commit 'dc88bfa430c053766c031d431863a89abb6eab72':

Change-Id: I1f38514ed2e9f1b5a1240f0ef39cfa86200969d1
 2016-05-19 02:01:25 +00:00
Andrii Kulian
fe8863e5cc Merge "Merge "Rename minWidth/Height attributes" into nyc-dev am: 42b3acf9d3 am: 1699b51cbe" into nyc-mr1-dev-plus-aosp 
am: c6e2e5fcc7

* commit 'c6e2e5fcc7cc937a4e1e0792ece74b227f194db4':

Change-Id: I03d87fdf735a8ebbe6bbb25d01b79747f84e50da
 2016-05-19 02:01:21 +00:00