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

197614 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
66f59dc1bd am 1570b6b3: Merge "Enable EMERGENCY mobile connections." into mnc-dev 
* commit '1570b6b3c7d1d41a52555312d161d0afe4b81df3':
  Enable EMERGENCY mobile connections.
 2015-07-10 18:38:22 +00:00
Robert Greenwalt
d30a3d6693 am 1ebcb6f8: Merge "Fix permissions." into mnc-dev 
* commit '1ebcb6f8b2f989c84311555f4961506dba959d37':
  Fix permissions.
 2015-07-10 18:38:15 +00:00
Raph Levien
5d1654a943 Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev 2015-07-10 18:37:49 +00:00
Robert Greenwalt
1570b6b3c7 Merge "Enable EMERGENCY mobile connections." into mnc-dev 2015-07-10 18:23:24 +00:00
Robert Greenwalt
1ebcb6f8b2 Merge "Fix permissions." into mnc-dev 2015-07-10 18:21:48 +00:00
Chris Banes
9c533577cf am ead0cea0: am 77cae786: am 98b1f102: am c2b0d1d4: Merge "Support Library v22.2.0 API diff" into mnc-preview-docs 
* commit 'ead0cea0f57565aeb6ddc3a78ec1da3314d264a8':
  Support Library v22.2.0 API diff
 2015-07-10 18:14:25 +00:00
John Reck
1e2063fb22 am d1b16386: am 2c7ed6e8: Merge "Improve ImageView drawable re-use" into mnc-dev 
* commit 'd1b16386e7a2c793bb0fc3d19708f1c2853e92da':
  Improve ImageView drawable re-use
 2015-07-10 18:14:19 +00:00
John Reck
4108f56534 am b25c0bb7: am 525ac80d: Merge "Create a thread_local cache for textLocale" into mnc-dev 
* commit 'b25c0bb7ad06c7339555b54e17e183e04ed40d13':
  Create a thread_local cache for textLocale
 2015-07-10 18:14:15 +00:00
David Friedman
adfbd57278 am d38de2a1: am a2c2cc42: am 3f831568: am 6fb22b4e: Docs: Revisions to top DAC landing page and several Preview-page revisions. 
* commit 'd38de2a14d59d99eba9e2611132ff50a0e825ae2':
  Docs: Revisions to top DAC landing page and several Preview-page revisions.
 2015-07-10 18:14:10 +00:00
Chris Banes
ead0cea0f5 am 77cae786: am 98b1f102: am c2b0d1d4: Merge "Support Library v22.2.0 API diff" into mnc-preview-docs 
* commit '77cae7869dba770f9ec8054b312a29dea8f317f4':
  Support Library v22.2.0 API diff
 2015-07-10 18:00:58 +00:00
John Reck
d1b16386e7 am 2c7ed6e8: Merge "Improve ImageView drawable re-use" into mnc-dev 
* commit '2c7ed6e80a7e9504a0c0e13a27e54332c603d1cc':
  Improve ImageView drawable re-use
 2015-07-10 18:00:55 +00:00
John Reck
b25c0bb7ad am 525ac80d: Merge "Create a thread_local cache for textLocale" into mnc-dev 
* commit '525ac80d2dda4ce7a902b67d082ed26d0986f525':
  Create a thread_local cache for textLocale
 2015-07-10 18:00:50 +00:00
David Friedman
d38de2a14d am a2c2cc42: am 3f831568: am 6fb22b4e: Docs: Revisions to top DAC landing page and several Preview-page revisions. 
* commit 'a2c2cc422c47a62b5494c9090b644a8fae8a9037':
  Docs: Revisions to top DAC landing page and several Preview-page revisions.
 2015-07-10 18:00:46 +00:00
John Reck
c6024cdd35 JNI optimization tweaks to Paint high-frequency methods 
Bug: 22378829

Use fast-jni for getFontMetrics, drops from 35us -> 30us
Note the "heavy" part of the method, getMetricsInternal, is
already called by other fast-jni methods.

Use critical array access for getRunAdvance_* methods. This
will avoid the copy and the access is appropriately scoped
and fast enough to not significantly block the moving GC.
Improves from 88us -> 79us on short text

Change-Id: I7c1481c23f6dba3420fbcf48220f6335cf9f6d10
 2015-07-10 10:58:46 -07:00
Chris Banes
77cae7869d am 98b1f102: am c2b0d1d4: Merge "Support Library v22.2.0 API diff" into mnc-preview-docs 
* commit '98b1f1025c606f955ab9afc3872a435a770e3813':
  Support Library v22.2.0 API diff
 2015-07-10 17:54:40 +00:00
Sanket Padawe
194cce695b Changes security for Passpoint to EAP security from "Passpoint". 
Bug: 22402754
Change-Id: I3afbb6f3f446657a3e9505122032f4edc6401302
 2015-07-10 10:53:31 -07:00
John Reck
2c7ed6e80a Merge "Improve ImageView drawable re-use" into mnc-dev 2015-07-10 17:50:28 +00:00
John Reck
525ac80d2d Merge "Create a thread_local cache for textLocale" into mnc-dev 2015-07-10 17:50:12 +00:00
David Friedman
a2c2cc422c am 3f831568: am 6fb22b4e: Docs: Revisions to top DAC landing page and several Preview-page revisions. 
* commit '3f83156867fba70db9f2a03f2f0192d8f3b4688e':
  Docs: Revisions to top DAC landing page and several Preview-page revisions.
 2015-07-10 17:43:32 +00:00
Chris Banes
98b1f1025c am c2b0d1d4: Merge "Support Library v22.2.0 API diff" into mnc-preview-docs 
* commit 'c2b0d1d42cf6ba2e77fdf31982b3436eeb95b89c':
  Support Library v22.2.0 API diff
 2015-07-10 17:39:34 +00:00
Vinit Deshpande
5b7352cf1b Fix multiple SSIDs for same Passpoint issues 
This change fixes Wifi Settings UI for passpoint. The
connected notification now should show up only for the
SSIDs that match.

Bug: 22200890
Change-Id: If69a9364eca5505fe2d4037217f1777fa4d823f5
 2015-07-10 10:39:16 -07: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
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
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
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
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
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
Esteban Talavera
1af7588da2 Use correct user when filtering app link candidates 
Bug: 22288835
Change-Id: I29b3ac04e66b5e93f5cf29fd618b98d1c8106f58
 2015-07-10 14:59:49 +01: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
7478bc1308 am aa70c332: am 0236e6b2: Fix the build. 
* commit 'aa70c3328b7683bf6a0fea206124508a32cacf63':
  Fix the build.
 2015-07-10 04:35:57 +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
0236e6b2d6 Fix the build. 
Correct a typo.

Change-Id: I16131cf7c0ce17fa09dedc67264e8199482cd27e
 2015-07-09 21:06:27 -07:00
Jinsuk Kim
8ea452e3f6 CEC: Do not switch language if the new one is same as the old one 
Do not switch language if the new language is the same as
the current one. This helps avoid accidental country variant
switching such as from en_US to en_AU due to the limitation of CEC.

Bug: 22373619
Change-Id: Ia98aff67e37b470b3f550a5c097e8140c1a51ecf
 2015-07-10 13:06:20 +09:00
Svetoslav
45853168d4 am 224ec55f: am 664251a2: Merge "Fix build" into mnc-dev 
* commit '224ec55f98afdf571334723285f9d51682b7f82b':
  Fix build
 2015-07-10 04:03:43 +00:00