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

1337 Commits

Author SHA1 Message Date
Jon Larimer
0f2d0dbac6 am 3a6d8f54: am 90d5bd8d: am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
automerge: ff526fa

* commit 'ff526fa7106fd45bfc4f1606fe051000c5201920':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 22:41:30 +00:00
Jon Larimer
ff526fa710 am 3a6d8f54: am 90d5bd8d: am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit '3a6d8f5473f2451a0bdf13d4cc1d31e419d23f0c':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 22:40:17 +00:00
Jon Larimer
90d5bd8daa am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit 'feb362a5d194b30226caf2efbaae77991007c65c':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 22:24:43 +00:00
Jon Larimer
a0d3bfbe87 am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit '5c9d0de174caf151937f19aa6898f60bce3fb4f4':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 22:11:56 +00:00
Jon Larimer
5c9d0de174 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit '545dd853bffbf778a0a44816ac6ed381b13f2158':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 22:01:50 +00:00
Jon Larimer
9a425aa71c am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit '159aa73574804967aded45d06b70df5a8dd64a58':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 21:44:17 +00:00
Jon Larimer
159aa73574 am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit 'd403180997898c98f0be15b810c4c9dd9002f92c':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 21:28:59 +00:00
Jon Larimer
48c95c4370 Fix build breakage in older branches by avoiding <> notation 
Change-Id: I5e3d523dac1f364f52f0d2cab479c1705d667e5a
 2015-01-29 15:54:43 -05:00
Jon Larimer
9570e144fe am ea63fd7f: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev 
* commit 'ea63fd7f9b4bb2701c9d12ab8775867dbdeefcf1':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
 2015-01-29 18:43:47 +00:00
Jon Larimer
ea63fd7f9b am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev 
* commit '88add68942694fc643518bcf5c26f6c3df7e9aa0':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
 2015-01-29 18:36:59 +00:00
Jon Larimer
a5ccca2427 am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev 
* commit '2982d64802ed0d5b59130680c43485e9d7862e50':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
 2015-01-29 18:25:28 +00:00
Jon Larimer
2982d64802 am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev 
* commit 'de9a76ed997c300a6c5f2f82c517719503af9045':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
 2015-01-29 18:12:01 +00:00
Adam Lesinski
f741c37273 Fix ParceledListSlice to enforce the same concrete types among its elements. 
Bug:17671747
Change-Id: I896f75738e5b464ccb6c03290f139cc2fa72f966
(cherry picked from commit 3df1c38ee098872352086e03d6f1adb16796ee29)
 2015-01-28 10:47:54 +00:00
Jorim Jaggi
cb4f594eca Remove dead code : Remove more unused classes 
Change-Id: Ie78d40fd20eef859e3c0ea9269b86ff1e1471a58
 2015-01-27 18:15:50 +01:00
Jorim Jaggi
de47e3554d Revert "Remove dead code : Remove more unused classes" 
This reverts commit 397ca8be8de407237cd293873647c182837bc032.

Change-Id: Id7f8dbe93d2a48a7f6261232499f73b7de8dd7b1
Reason: Build breakage.
 2015-01-27 16:52:24 +00:00
Jorim Jaggi
397ca8be8d Remove dead code : Remove more unused classes 
Change-Id: I3130991cb468a47aa0e198e42f20edca0836f66b
 2015-01-21 16:57:12 +01:00
Ying Wang
43df3c6c19 am b5108949: am e4a031e3: Merge "New trick to install bad dex file." 
* commit 'b51089499c8c39fce47deccf70d3ea069c58b471':
  New trick to install bad dex file.
 2015-01-20 22:01:26 +00:00
Ying Wang
b643624d2f New trick to install bad dex file. 
Previously we use LOCAL_JAVA_RESOURCE_FILES to override the normally
generated classes.dex with a bad dex file.
Now as we have moved Java resource processing before running jarjar, dx
would fail for the bad classes.dex inside the classes.jar.
Instead we override the target specific variable PRIVATE_DEX_FILE to
inject the bad dex file.

(cherry-picked from commit f122d90c290c789e0d0085127beebdcf1935c127)

Bug: 18837479
Change-Id: I73f82c8a15e1d8935d9c2f290ba9456184a56ec7
 2015-01-20 12:15:17 -08:00
Ying Wang
63ae9f3309 Merge "New trick to install bad dex file." 2015-01-20 19:39:43 +00:00
Neil Fuller
d3ef970ca8 am b3f73dc5: am b55011e4: am f9c04f17: Merge "Removing HttpResponseCacheTest" 
* commit 'b3f73dc5179532d587f743a9831faff3584c7c5b':
  Removing HttpResponseCacheTest
 2015-01-16 10:35:30 +00:00
Neil Fuller
b3f73dc517 am b55011e4: am f9c04f17: Merge "Removing HttpResponseCacheTest" 
* commit 'b55011e4265f866604ed0c3ffe0241436682c3d2':
  Removing HttpResponseCacheTest
 2015-01-16 10:29:51 +00:00
Neil Fuller
60cf05c1b3 Removing HttpResponseCacheTest 
Moving HttpResponseCacheTest.java from
frameworks/base/core/tests/coretests/src/android/net/http
to
cts/tests/tests/net/src/android/net/http/cts

Change-Id: I61a07c53f8d0ef55d35b928f244e4680725b76ef
 2015-01-15 16:00:42 +00:00
Ying Wang
f122d90c29 New trick to install bad dex file. 
Previously we use LOCAL_JAVA_RESOURCE_FILES to override the normally
generated classes.dex with a bad dex file.
Now as we have moved Java resource processing before running jarjar, dx
would fail for the bad classes.dex inside the classes.jar.
Instead we override the target specific variable PRIVATE_DEX_FILE to
inject the bad dex file.

Bug: 18837479
Change-Id: I73f82c8a15e1d8935d9c2f290ba9456184a56ec7
 2015-01-14 16:22:45 -08:00
Neil Fuller
60b268f039 am f5f345cf: am 837261cc: Merge "Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade." 
* commit 'f5f345cf929908bd863143815743c44778d29e4a':
  Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade.
 2015-01-12 16:44:36 +00:00
Neil Fuller
b7260cbcc4 Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade. 
OkHttp recently changed the behavior of their caching with
commit e74e3f3bf744ef7f4d8ee724a7cf2347e486cfab - it is now
neccessary to close the inputstream (or disconnect the
HttpURLConnection) for a response to be cached.

This change is (effectively) a no-op prior to the upgrade.

The behavior is undefined as to whether closing the
input stream is required for caching. OkHttp's new behavior
is consistent with other HttpURLConnection implementations
tried.

(cherry-picked from commit 62d0677b0f6cc5ae48fd0b816ea5caad82264fd6)

Change-Id: Ibe698a443ec98866787ed9da2698322fab856518
 2015-01-12 16:05:26 +00:00
Neil Fuller
62d0677b0f Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade. 
OkHttp recently changed the behavior of their caching with
commit e74e3f3bf744ef7f4d8ee724a7cf2347e486cfab - it is now
neccessary to close the inputstream (or disconnect the
HttpURLConnection) for a response to be cached.

This change is (effectively) a no-op prior to the upgrade.

The behavior is undefined as to whether closing the
input stream is required for caching. OkHttp's new behavior
is consistent with other HttpURLConnection implementations
tried.

Change-Id: Iaf57371651296ac84850971ef60a9338cead57c0
 2015-01-09 11:50:50 +00:00
Elliott Hughes
fcc0788419 am 93241de7: Merge "Remove a bitrotted test." automerge: ba6982a 
automerge: 9962ed5

* commit '9962ed55759336642cfaba27e8b2a47822f562fe':
  Remove a bitrotted test.
 2014-12-18 02:42:27 +00:00
Elliott Hughes
9962ed5575 am 93241de7: Merge "Remove a bitrotted test." 
automerge: ba6982a

* commit 'ba6982a16cb3b9f6196fdac11d1d90a02eb32cfd':
  Remove a bitrotted test.
 2014-12-18 02:40:10 +00:00
Elliott Hughes
988fd73499 Remove a bitrotted test. 
Change-Id: I4c44f2da0544dbfde8e340f7f477191725c5fb8b
 2014-12-17 16:29:04 -08:00
Yohann Roussel
e1c00320b6 Merge "Allow compilation with Jack." 2014-12-04 09:26:54 +00:00
Jeff Sharkey
45207128c5 am 05d455ca: am b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev 
* commit '05d455ca2b83793a81aac2544c388eec8ac140cd':
  Sanitize display names, keep extensions intact.
 2014-12-01 20:00:32 +00:00
Jeff Sharkey
0cce5355b4 Sanitize display names, keep extensions intact. 
When creating or renaming files on external storage, sanitize the
requested display names to be valid FAT filenames.  This also fixes
a handful of directory traversal bugs.

Also relax logic around generating display names to allow any
extension which maps to the requested MIME type.  Tests to verify.

Bug: 18512473, 18504132
Change-Id: I89e632019ee145f53d9d9d2050932f8939a756af
 2014-12-01 09:38:49 -08:00
Yohann Roussel
8596021c3b am 3e5223fd: am 6829daa4: Merge "Add tests about annotations and enum." 
* commit '3e5223fd02d0f096ca50c964378c717adbb2e3e9':
  Add tests about annotations and enum.
 2014-12-01 10:12:09 +00:00
Yohann Roussel
6829daa44a Merge "Add tests about annotations and enum." 2014-12-01 09:30:59 +00:00
Conley Owens
e1fe4fa431 am 6a53bd9d: am 69d28437: Merge "RRO tests: fix potential NPE" 
* commit '6a53bd9ddbff5dcccec3cd3928e10317007031d3':
  RRO tests: fix potential NPE
 2014-11-26 18:14:34 +00:00
Conley Owens
ea796d7028 am c657b302: am ed23786c: Merge "RRO tests: adapt tests to split apks" 
* commit 'c657b302e5744e7de9ca142126ba3b428ce5a143':
  RRO tests: adapt tests to split apks
 2014-11-26 18:14:28 +00:00
Conley Owens
69d28437d3 Merge "RRO tests: fix potential NPE" 2014-11-26 17:57:09 +00:00
Conley Owens
ed23786cc5 Merge "RRO tests: adapt tests to split apks" 2014-11-26 17:56:48 +00:00
Jeff Sharkey
79ef5ef7a5 am 54c11274: am c0491a2e: Merge "Lightweight checkin output for network stats." into lmp-mr1-dev 
* commit '54c11274b5e7ce9f774f7c846d7165563279b96a':
  Lightweight checkin output for network stats.
 2014-11-21 22:09:28 +00:00
Jeff Sharkey
55a442e582 Lightweight checkin output for network stats. 
Define and print a compact version of network statistics when dump
is requested with the "--checkin" flag.  Defaults to last 24 hours,
but included data can be tweaked with various flags.

Groups together detailed network identities into larger umbrella
terms like "mobile" and "wifi."

Bug: 18415963
Change-Id: I70cf9c828ea5c6e5bb6884837d3608f66fbad2e6
 2014-11-21 10:11:10 -08:00
Eric Rowe
496c67031b am 1d76d397: Merge "Fix wifi reconnection tests." into lmp-mr1-dev 
automerge: 3b442e2

* commit '3b442e23d859e84fe0550242257294c0b1e37438':
  Fix wifi reconnection tests.
 2014-11-21 02:43:06 +00:00
Eric Rowe
37368d7ae4 am 79de0066: Merge "Fix wifi tethering tests." into lmp-mr1-dev 
automerge: d2fd1bd

* commit 'd2fd1bd9d631e822b03bfabd41853cc3075f61bf':
  Fix wifi tethering tests.
 2014-11-21 02:35:36 +00:00
Eric Rowe
ef1a177e6c Fix wifi reconnection tests. 
Bug: 18417638
Change-Id: I1710e8b16d4ae1b32317deb0322a98ad45b4e1aa
 2014-11-20 12:32:58 -08:00
Eric Rowe
4902ac4e24 Fix wifi tethering tests. 
Bug: 18418170
Change-Id: Ic3e8b74523c6a8b6003c05258447e9a673541248
 2014-11-20 11:21:54 -08:00
Yohann Roussel
79b4ee8e97 Add tests about annotations and enum. 
For reproduction of https://code.google.com/p/android/issues/detail?id=78144

Bug: 18385117

Change-Id: I23be53a0ae481a501d13adc8abf518ac664a772f
 2014-11-20 15:17:43 +01:00
Yohann Roussel
248ef6f9c4 Allow compilation with Jack. 
Change-Id: I03ccd6cd92102f03d1316b6a1184c49029c91ea0
 2014-11-13 12:05:23 +01:00
Adam Lesinski
ffd4785e3c am 648f8106: am db3d76ab: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev 
* commit '648f81064747b58be7ea9efab6d5744d6b49397a':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
 2014-11-13 00:40:28 +00:00
Adam Lesinski
db3d76ab68 Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into lmp-mr1-dev 2014-11-13 00:33:00 +00:00
Jeff Sharkey
bea6648df5 am a2781fda: am 521ca5f8: am 2e700004: am d68b87cd: Recover apps with malformed certificates. 
* commit 'a2781fdac332c4f6277a986c88e34daa25a3b5f9':
  Recover apps with malformed certificates.
 2014-11-12 23:50:47 +00:00
Jeff Sharkey
521ca5f8fb am 2e700004: am d68b87cd: Recover apps with malformed certificates. 
* commit '2e7000040e3d836bb591e29515974817afc49488':
  Recover apps with malformed certificates.
 2014-11-12 22:24:24 +00:00