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

231915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Doris Liu
3aaff80f32 Revert "Fix NPE for invalid target exception" 
This reverts commit d4fda02dd59adff9553dca5647ebb6c023145d5f.

Change-Id: I73341dc41c7effaa3209107b4e85503b17e2c826
 2016-02-04 20:02:52 +00:00
Doris Liu
d4fda02dd5 Fix NPE for invalid target exception 
Change-Id: I57b319fae617792351c6ec9872c3b73cd25dc4e5
 2016-02-03 11:10:49 -08:00
Derek Sollenberger
0eef10e556 Merge "Update Canvas API with view system calls." 2016-02-03 17:59:11 +00:00
Geoff Mendal
b3187cc67d Merge "Import translations. DO NOT MERGE" 2016-02-03 17:55:05 +00:00
Geoff Mendal
a59ad81849 Import translations. DO NOT MERGE 
Change-Id: Iad2ccbf1fef7c8ca217e78134a6fa66b738f97f8
Auto-generated-cl: translation import
 2016-02-03 18:53:27 +01:00
Kenny Guy
c5947f8b76 Merge "Match non-crypto aware admins when registering." 2016-02-03 17:45:03 +00:00
Geoff Mendal
5aaac0152f Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 17:18:44 +00:00
Geoff Mendal
ff63640526 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 8152fbd7e9 -s ours 
am: f322b46028  -s ours

* commit 'f322b4602893a9cb3eae30ac0f4f196b3dc95176':
  Import translations. DO NOT MERGE
 2016-02-03 17:17:01 +00:00
Paul Jensen
1a737fbd78 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 17:16:58 +00:00
Ben Kwa
501fde65b5 Merge "Lint fixes and config tweaks." 2016-02-03 17:12:53 +00:00
Paul Jensen
8514a8131f Merge "Android packet filtering program interpreter test & program generator" into mm-wireless-dev 
am: 44307adcf3

* commit '44307adcf371bacad4de6925a9207bdbfdc6f874':
  Android packet filtering program interpreter test & program generator
 2016-02-03 17:12:47 +00:00
Ben Kwa
e3aee18dc9 Lint fixes and config tweaks. 
- Add recommended ignore properties to lint.xml.
- Make Fragment subclasses public.
- Truncate log tags at 23 chars.
- Fix one instance of passing a color ID instead of a color.
- Misc xml property fixes.

Change-Id: Ie8d6a8932cda72b7a239f6dfab56bd854f909820
 2016-02-03 09:09:40 -08:00
Selim Gurun
061371b3ee Merge "Make abiOverride attribute public" 2016-02-03 17:09:09 +00:00
Paul Jensen
44307adcf3 Merge "Android packet filtering program interpreter test & program generator" into mm-wireless-dev 2016-02-03 16:48:43 +00:00
Geoff Mendal
f322b46028 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 
am: 8152fbd7e9  -s ours

* commit '8152fbd7e999fe57f85944a12b281be47fec0a79':
  Import translations. DO NOT MERGE
 2016-02-03 16:40:38 +00:00
Geoff Mendal
3852b0e888 Import translations. DO NOT MERGE am: a3144a52c6 -s ours am: 1a0c0953a0 -s ours 
am: 04364c7464  -s ours

* commit '04364c74640965e92fb48be2c9ba0f4d75e1f8bf':
  Import translations. DO NOT MERGE
 2016-02-03 16:40:29 +00:00
Florin Malita
7ee59adce5 Merge "Remove remaining references to SkCanvas::SaveFlags" 2016-02-03 16:29:22 +00:00
Geoff Mendal
04364c7464 Import translations. DO NOT MERGE am: a3144a52c6 -s ours 
am: 1a0c0953a0  -s ours

* commit '1a0c0953a0ffebe876e9abcf63d2c3e8e2d12a6f':
  Import translations. DO NOT MERGE
 2016-02-03 15:54:07 +00:00
Florin Malita
777bf85c16 Remove remaining references to SkCanvas::SaveFlags 
One SkCanvas save flag reference snuck back in after the last
cleanup.  Convert to the new SaveFlags enum.

Change-Id: I9ba4b01a19bbb80276c84d30fd0d7b9513892cf9
 2016-02-03 10:48:55 -05:00
Geoff Mendal
8152fbd7e9 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 2016-02-03 15:44:40 +00:00
Geoff Mendal
d6a791fc1f Import translations. DO NOT MERGE 
Change-Id: I801233d391712c477e3b38b912465333b483a78b
Auto-generated-cl: translation import
 2016-02-03 10:42:52 -05:00
Sudheer Shanka
5e8a6e5661 Merge "Add an utility method to get device owner." 2016-02-03 15:31:55 +00:00
Geoff Mendal
1a0c0953a0 Import translations. DO NOT MERGE 
am: a3144a52c6  -s ours

* commit 'a3144a52c63a8f69f0f79fe05070fd181bc70b1d':
  Import translations. DO NOT MERGE
 2016-02-03 15:24:32 +00:00
Paul Jensen
d38fb7662d Android packet filtering program interpreter test & program generator 
Change-Id: I17951bd6320b9eb3b6c43f2ae37f62c2025705c1
 2016-02-03 10:19:13 -05:00
Geoff Mendal
d9eec15d84 Merge "Import translations. DO NOT MERGE" 2016-02-03 14:58:49 +00:00
Geoff Mendal
a3144a52c6 Import translations. DO NOT MERGE 
Change-Id: I3f9c8af09874bbdb5473ffb49a49f21c2d3bc12a
Auto-generated-cl: translation import
 2016-02-03 09:57:33 -05:00
Geoff Mendal
1f7b7aecbd Import translations. DO NOT MERGE 
Change-Id: I423629c9356693e4aa2fa8dfc9d32ff662e1d414
Auto-generated-cl: translation import
 2016-02-03 06:53:26 -08:00
Erik Kline
3d51d8bacc Ignore link properties updates when nothing actually changed. 
am: 6076cb0b85

* commit '6076cb0b859185b075d3a70655afb192d68d0774':
  Ignore link properties updates when nothing actually changed.
 2016-02-03 14:37:11 +00:00
Erik Kline
e5345d8603 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 14:34:03 +00:00
Erik Kline
d33e6232fe Partial unification of DHCPv4 and static IPv4 configuration codepaths 
am: 8deac7793c

* commit '8deac7793c32be0c3b64b64d48dd9c0e2407e8db':
  Partial unification of DHCPv4 and static IPv4 configuration codepaths
 2016-02-03 14:29:32 +00:00
Erik Kline
e056b88755 Partial unification of DHCPv4 and static IPv4 configuration codepaths 
am: 8deac7793c

* commit '8deac7793c32be0c3b64b64d48dd9c0e2407e8db':
  Partial unification of DHCPv4 and static IPv4 configuration codepaths
 2016-02-03 14:25:36 +00:00
Kenny Guy
8c41a1c9bc Match non-crypto aware admins when registering. 
Profile owners are registered before the user is
started and unlocked, so we need to check for
components that aren't cryptoware when looking
for the admin.

Bug: 26924254
Change-Id: I61fca0a3d6e490ca6fea9a7bdc8f2c44efde74f2
 2016-02-03 14:20:30 +00:00
Geoff Mendal
adf19a8402 Merge "Import translations. DO NOT MERGE" 2016-02-03 14:16:20 +00:00
Geoff Mendal
18e74d09d5 Import translations. DO NOT MERGE 
Change-Id: I6b612ab71f970dc349b0178e3c9f4008dbfbe1fa
Auto-generated-cl: translation import
 2016-02-03 06:13:05 -08:00
Derek Sollenberger
6f485569fa Update Canvas API with view system calls. 
Refactor DisplayListCanvas, RecordingCanvas, and SkiaCanvas
to share a common API.

Change-Id: I0268ec2749ea5d13a3a72bb2784ed6a9911383d9
 2016-02-03 09:13:04 -05:00
Youngsang Cho
5d30450389 Merge "TIF: call RecordingCallback.onConnected when SessionCallback.onConnected is called" 2016-02-03 14:11:12 +00:00
Leon Scroggins
5e4aa93df6 Merge "Lock SkBitmap before accessing color table" 2016-02-03 13:49:28 +00:00
Geoff Mendal
b630657362 Merge "Import translations. DO NOT MERGE" 2016-02-03 13:46:59 +00:00
Geoff Mendal
8b086bc92e Import translations. DO NOT MERGE 
Change-Id: Ie886d9dc699d739dc174690080dbbaeb7368c135
Auto-generated-cl: translation import
 2016-02-03 05:46:15 -08:00
Erik Kline
6076cb0b85 Ignore link properties updates when nothing actually changed. 
Change-Id: Ia3c0a652cb3b67707a5c5a0bb40f991ef1e6f777
 2016-02-03 22:42:54 +09:00
Erik Kline
8deac7793c Partial unification of DHCPv4 and static IPv4 configuration codepaths 
Change-Id: Ic796f9b7bb853a332175c34e0f557588efb6247a
 2016-02-03 22:42:53 +09:00
Geoff Mendal
0a2ca5e337 Merge "Import translations. DO NOT MERGE" 2016-02-03 13:38:55 +00:00
Geoff Mendal
8c0fe42f23 Merge "Import translations. DO NOT MERGE" 2016-02-03 13:32:36 +00:00
Geoff Mendal
7f12433559 Import translations. DO NOT MERGE 
Change-Id: Ifb2402466432bdd2e6ea28882ee595063ae48056
Auto-generated-cl: translation import
 2016-02-03 05:29:03 -08:00
Geoff Mendal
832d16d36e Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 13:25:15 +00:00
Geoff Mendal
3b50bd1825 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: d3f6510b6f -s ours 
am: 04defe7b2f  -s ours

* commit '04defe7b2f8ebeb931f72b51c206e113adc39ed2':
  Import translations. DO NOT MERGE
 2016-02-03 13:22:07 +00:00
Geoff Mendal
4d39ddda68 Import translations. DO NOT MERGE 
Change-Id: Ic0a054fee74b73afa16574a0c16fc7bc926b2bf7
Auto-generated-cl: translation import
 2016-02-03 05:16:51 -08:00
Geoff Mendal
e1abb7d839 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: d3f6510b6f -s ours 
am: 04defe7b2f  -s ours

* commit '04defe7b2f8ebeb931f72b51c206e113adc39ed2':
  Import translations. DO NOT MERGE
 2016-02-03 13:16:30 +00:00
Geoff Mendal
31f9e6fef6 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 7c5cf65b83 -s ours 
am: f445067f52  -s ours

* commit 'f445067f52ca6ff9f16da32cdcd81e32eeffd51d':
  Import translations. DO NOT MERGE
 2016-02-03 13:07:41 +00:00
Geoff Mendal
b66ba941f5 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-02-03 13:05:48 +00:00