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

206359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roshan Pius
affda16a72 am 17b2a31a: am 0eb4da60: am 1cb0de17: Merge "Correct the comparison done in removeAdapter." into mnc-dev 
* commit '17b2a31a1be62b7f7e0c9442a2fec5f96d828e67':
  Correct the comparison done in removeAdapter.
 2015-07-10 17:35:17 +00:00
Paul Jensen
59cabcece2 am 42280a7a: am 0bac7fa7: am 3b9ce37b: Fix build break. 
* commit '42280a7a49864aa857311cb4aa5a20624dbf5188':
  Fix build break.
 2015-07-10 17:22:50 +00:00
Filip Gruszczynski
da7c03e724 am 74d0c63a: am c3d69a79: (-s ours) DO NOT MERGE - Fix NPE when requesting outsets for detached view. 
* commit '74d0c63a553a029ca930ea8ed844e0207d9cb41c':
  DO NOT MERGE - Fix NPE when requesting outsets for detached view.
 2015-07-10 17:22:44 +00:00
Roshan Pius
17b2a31a1b am 0eb4da60: am 1cb0de17: Merge "Correct the comparison done in removeAdapter." into mnc-dev 
* commit '0eb4da607118e28d56d18ff1bd1f060b0431c61c':
  Correct the comparison done in removeAdapter.
 2015-07-10 17:22:05 +00:00
Paul Jensen
42280a7a49 am 0bac7fa7: am 3b9ce37b: Fix build break. 
* commit '0bac7fa791ced8e1e1ab67eca72c48be1b19eded':
  Fix build break.
 2015-07-10 17:10:40 +00:00
Roshan Pius
0eb4da6071 am 1cb0de17: Merge "Correct the comparison done in removeAdapter." into mnc-dev 
* commit '1cb0de17a9a4de137247f7bf69ec44a83e30efa2':
  Correct the comparison done in removeAdapter.
 2015-07-10 17:10:30 +00:00
Filip Gruszczynski
74d0c63a55 am c3d69a79: (-s ours) DO NOT MERGE - Fix NPE when requesting outsets for detached view. 
* commit 'c3d69a798ee7093c87e929735d43cd27a8b0b131':
  DO NOT MERGE - Fix NPE when requesting outsets for detached view.
 2015-07-10 17:09:57 +00:00
John Reck
476f715822 Create a thread_local cache for textLocale 
Bug:22378829

toLanguageTag is significantly more expensive than previously
thought (note ULOC_FULLNAME_CAPACITY is 157) and weighs
in at around 40us. Given that this is called on every Paint
and that there are typically thousands of Paint objects
created this adds up very quickly.

Given that the locale is almost always Locale.getDefault(),
a very simple thread_local cache of size 1 fixes this trivially

Change-Id: I819e60cac7a4b27e9dd5538332c22ce5bbd0851c
 2015-07-10 10:08:31 -07:00
John Reck
5a1356916d Improve ImageView drawable re-use 
Bug 22403868

Initial attempt only helped if setImageBitmap() was the only
thing called but during new-loading content it's common for a
placeholder to be set via setImageDrawable.

Tweak ImageView slightly to just have a BitmapDrawable that it
lazy-creates but will hold on to for any subsequent calls
to setImageBitmap

Change-Id: I7380521c7b363d458e4cda041f1f8b2b1fb3a93a
 2015-07-10 10:08:01 -07:00
Paul Jensen
365504aca4 am c4417cf9: am f50ac2e7: am cfedbc43: am 7f9e3274: am bbce221e: Merge "Fallback to Cellular if WiFi fails to validate" into mnc-dev 
* commit 'c4417cf98a98211072b36cb246d0e30aa650e2f2':
  Fallback to Cellular if WiFi fails to validate
 2015-07-10 16:58:13 +00:00
Paul Jensen
84bfd14cce am f1576d8d: am 54b98c71: am 99ef3aef: am b54ec1bd: am d8cdba0d: Merge "Prepare some ConnectivityService logic for fallback to Cellular change" into mnc-dev 
* commit 'f1576d8d07e844331685c35d976125f51a6d1a4d':
  Prepare some ConnectivityService logic for fallback to Cellular change
 2015-07-10 16:58:06 +00:00
Roshan Pius
1cb0de17a9 Merge "Correct the comparison done in removeAdapter." into mnc-dev 2015-07-10 16:54:43 +00:00
Paul Jensen
0bac7fa791 am 3b9ce37b: Fix build break. 
* commit '3b9ce37b51dcc7729489701d4e797fe91f2ef559':
  Fix build break.
 2015-07-10 16:51:41 +00:00
Paul Jensen
c4417cf98a am f50ac2e7: am cfedbc43: am 7f9e3274: am bbce221e: Merge "Fallback to Cellular if WiFi fails to validate" into mnc-dev 
* commit 'f50ac2e7bb0842bbb30f69c898a95f894b5d506c':
  Fallback to Cellular if WiFi fails to validate
 2015-07-10 16:43:55 +00:00
Paul Jensen
f1576d8d07 am 54b98c71: am 99ef3aef: am b54ec1bd: am d8cdba0d: Merge "Prepare some ConnectivityService logic for fallback to Cellular change" into mnc-dev 
* commit '54b98c71355c000a54f0f978b13ce9fabf1e5ef9':
  Prepare some ConnectivityService logic for fallback to Cellular change
 2015-07-10 16:43:50 +00:00
Robert Greenwalt
9bc8299ca0 Fix permissions. 
Legacy API should not need new permissions.
Also found some more hidden/system that should have permissions.

bug:22379438
bug:19257083
Change-Id: I24be0a90dffcffe03d25982a9b02eedcf03fbd59
 2015-07-10 09:42:08 -07:00
Paul Jensen
f50ac2e7bb am cfedbc43: am 7f9e3274: am bbce221e: Merge "Fallback to Cellular if WiFi fails to validate" into mnc-dev 
* commit 'cfedbc4371bff949bc2a4428e881c3842cb7ae9d':
  Fallback to Cellular if WiFi fails to validate
 2015-07-10 16:31:57 +00:00
Paul Jensen
54b98c7135 am 99ef3aef: am b54ec1bd: am d8cdba0d: Merge "Prepare some ConnectivityService logic for fallback to Cellular change" into mnc-dev 
* commit '99ef3aefdb7c6208aaba8e9cef18c1b2f2aeba76':
  Prepare some ConnectivityService logic for fallback to Cellular change
 2015-07-10 16:31:53 +00:00
Paul Jensen
3b9ce37b51 Fix build break. 
Automatic merge commit caused breakage due to someone else's
intervening change adding a call site of a function whose last
parameter I removed.  Function in question is
ConnectivityService.rematchAllNetworksAndRequests.
Changes that merged badly are 85cf78e and 8d48252.

Change-Id: I8fd32e1a187236a65c1b7c0ecdf17b817d108fd0
 2015-07-10 12:29:23 -04:00
Paul Jensen
cfedbc4371 am 7f9e3274: am bbce221e: Merge "Fallback to Cellular if WiFi fails to validate" into mnc-dev 
* commit '7f9e3274c411924b059b3e8b04e5794362badc74':
  Fallback to Cellular if WiFi fails to validate
 2015-07-10 16:20:30 +00:00
Paul Jensen
99ef3aefdb am b54ec1bd: am d8cdba0d: Merge "Prepare some ConnectivityService logic for fallback to Cellular change" into mnc-dev 
* commit 'b54ec1bd527882c5046ed4710fb8f1f9e1b90105':
  Prepare some ConnectivityService logic for fallback to Cellular change
 2015-07-10 16:20:26 +00:00
Paul Jensen
7f9e3274c4 am bbce221e: Merge "Fallback to Cellular if WiFi fails to validate" into mnc-dev 
* commit 'bbce221eecdf54317dd0655e5f3507b82db4bfc1':
  Fallback to Cellular if WiFi fails to validate
 2015-07-10 16:07:57 +00:00
Paul Jensen
b54ec1bd52 am d8cdba0d: Merge "Prepare some ConnectivityService logic for fallback to Cellular change" into mnc-dev 
* commit 'd8cdba0d711f5956475b043a50a6041075157c77':
  Prepare some ConnectivityService logic for fallback to Cellular change
 2015-07-10 16:07:53 +00:00
Paul Jensen
a6d97a575f am 851bcaf2: am ca36baaf: am 2cb16d2e: am 75a43340: am 00c64f7c: Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev 
* commit '851bcaf2edc88d3d193304d64415a50613f46141':
  Add android.net.CaptivePortal class for captive-portal-handling-app callbacks
 2015-07-10 15:57:45 +00:00
Paul Jensen
bbce221eec Merge "Fallback to Cellular if WiFi fails to validate" into mnc-dev 2015-07-10 15:51:38 +00:00
Paul Jensen
d8cdba0d71 Merge "Prepare some ConnectivityService logic for fallback to Cellular change" into mnc-dev 2015-07-10 15:51:23 +00:00
Paul Jensen
851bcaf2ed am ca36baaf: am 2cb16d2e: am 75a43340: am 00c64f7c: Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev 
* commit 'ca36baafef8024973ab8aebb54913a96db3d0e77':
  Add android.net.CaptivePortal class for captive-portal-handling-app callbacks
 2015-07-10 15:46:28 +00:00
Paul Jensen
ca36baafef am 2cb16d2e: am 75a43340: am 00c64f7c: Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev 
* commit '2cb16d2e71398fcb73e3c7ecba093a4bae4490cb':
  Add android.net.CaptivePortal class for captive-portal-handling-app callbacks
 2015-07-10 15:33:38 +00:00
Andres Morales
31d0e27070 Merge "[LockSettings] fail hard when there's an error enrolling" 2015-07-10 15:31:41 +00:00
Paul Jensen
2cb16d2e71 am 75a43340: am 00c64f7c: Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev 
* commit '75a43340b675fd13eac05965438aaac2a7164658':
  Add android.net.CaptivePortal class for captive-portal-handling-app callbacks
 2015-07-10 15:19:43 +00:00
Paul Jensen
75a43340b6 am 00c64f7c: Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev 
* commit '00c64f7ca5b05384dc3c208eff43e0b1a037a7d0':
  Add android.net.CaptivePortal class for captive-portal-handling-app callbacks
 2015-07-10 15:06:30 +00:00
Paul Jensen
00c64f7ca5 Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev 2015-07-10 14:57:13 +00:00
Tom Hudson
0f6cb32c75 am a5e2946f: am b9d7bba5: am 434b577f: am 8ac76504: am 9613e9b7: Merge "New setLocalMatrix() operation for HWUI" into mnc-dev 
* commit 'a5e2946f5ab7618997fb317ad9f5f56c160ebee5':
  New setLocalMatrix() operation for HWUI
 2015-07-10 13:35:27 +00:00
Tom Hudson
a5e2946f5a am b9d7bba5: am 434b577f: am 8ac76504: am 9613e9b7: Merge "New setLocalMatrix() operation for HWUI" into mnc-dev 
* commit 'b9d7bba5c5453f894608971fed44aed023dcd6ba':
  New setLocalMatrix() operation for HWUI
 2015-07-10 13:22:39 +00:00
Tom Hudson
b9d7bba5c5 am 434b577f: am 8ac76504: am 9613e9b7: Merge "New setLocalMatrix() operation for HWUI" into mnc-dev 
* commit '434b577fa7c42115d24c1cc9b13c698bc3b0860c':
  New setLocalMatrix() operation for HWUI
 2015-07-10 13:10:56 +00:00
Tom Hudson
434b577fa7 am 8ac76504: am 9613e9b7: Merge "New setLocalMatrix() operation for HWUI" into mnc-dev 
* commit '8ac76504feb4837ea524b2e62a0bd04c1e266d9a':
  New setLocalMatrix() operation for HWUI
 2015-07-10 12:58:53 +00:00
Tom Hudson
8ac76504fe am 9613e9b7: Merge "New setLocalMatrix() operation for HWUI" into mnc-dev 
* commit '9613e9b76410b15b7f2700080a17476bf9f3461c':
  New setLocalMatrix() operation for HWUI
 2015-07-10 12:46:24 +00:00
Tom Hudson
9613e9b764 Merge "New setLocalMatrix() operation for HWUI" into mnc-dev 2015-07-10 12:35:12 +00:00
Chris Banes
c2b0d1d42c Merge "Support Library v22.2.0 API diff" into mnc-preview-docs 2015-07-10 07:29:21 +00:00
Bart Sears
e962f2c8fb am cc72e69e: am c6b28e00: am 7478bc13: am aa70c332: am 0236e6b2: Fix the build. 
* commit 'cc72e69ec07e02157d0d946995a1fd1ec48c9279':
  Fix the build.
 2015-07-10 05:16:09 +00:00
Bart Sears
cc72e69ec0 am c6b28e00: am 7478bc13: am aa70c332: am 0236e6b2: Fix the build. 
* commit 'c6b28e0031cee240d74115d3909ee6c8de144265':
  Fix the build.
 2015-07-10 05:02:22 +00:00
Bart Sears
c6b28e0031 am 7478bc13: am aa70c332: am 0236e6b2: Fix the build. 
* commit '7478bc13084c1d3ab798116c7194c142aab2b4e2':
  Fix the build.
 2015-07-10 04:48:38 +00:00
Svetoslav
0a3365623f am c89f43ce: am 964b892b: am 45853168: am 224ec55f: am 664251a2: Merge "Fix build" into mnc-dev 
* commit 'c89f43ce9c5676af4f40297346959b7ff4a6c454':
  Fix build
 2015-07-10 04:42:49 +00:00
Bart Sears
7478bc1308 am aa70c332: am 0236e6b2: Fix the build. 
* commit 'aa70c3328b7683bf6a0fea206124508a32cacf63':
  Fix the build.
 2015-07-10 04:35:57 +00:00
Svetoslav
c89f43ce9c am 964b892b: am 45853168: am 224ec55f: am 664251a2: Merge "Fix build" into mnc-dev 
* commit '964b892bf8a2da33197f4eb6ecc943da9068d436':
  Fix build
 2015-07-10 04:30:00 +00:00
Bart Sears
aa70c3328b am 0236e6b2: Fix the build. 
* commit '0236e6b2d614abd11678de4cec4ed67b582541ff':
  Fix the build.
 2015-07-10 04:22:55 +00:00
Bart Sears
f65166af52 am 1893e12f: am 19dd9c9c: am 6d583ad9: am 1773f2df: am 1aa40492: Merge "Revert "Security: AccountChooser shouldn\'t auto reveal accounts."" into mnc-dev 
* commit '1893e12f9cdc9d1caa54e773241803f9e5777c30':
  Revert "Security: AccountChooser shouldn't auto reveal accounts."
 2015-07-10 04:15:23 +00:00
Eino-Ville Talvala
e9f09e4f3d am 440cfa88: am 9bc8438e: am 9dbe6b1f: am 3aa7069b: am a2cd9c56: Merge "Camera2: Reorganize high-speed recording API slightly" into mnc-dev 
* commit '440cfa88769641d12566918df4901d5a6c8c193e':
  Camera2: Reorganize high-speed recording API slightly
 2015-07-10 04:15:16 +00:00
Svetoslav
964b892bf8 am 45853168: am 224ec55f: am 664251a2: Merge "Fix build" into mnc-dev 
* commit '45853168d4aa86fe84ce1340786dc41711153028':
  Fix build
 2015-07-10 04:15:13 +00:00
Bart Sears
0236e6b2d6 Fix the build. 
Correct a typo.

Change-Id: I16131cf7c0ce17fa09dedc67264e8199482cd27e
 2015-07-09 21:06:27 -07:00