Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
197,466 Commits 3 Branches 0 Tags
140ff7a50b826b277ea8cecbfd11df3d3eeddad4
Commit Graph

53472 Commits

Author SHA1 Message Date
Paul Crowley
140ff7a50b am bac3d093: Merge "Delete the user key when deleting a user." into mnc-dr-dev 
* commit 'bac3d0936dfdb4d594873fd8690e8017e748ed96':
  Delete the user key when deleting a user.
 2015-07-13 22:34:51 +00:00
Paul Crowley
62d43bd9e8 am 9e0e6991: Merge "Use mount service to create user dirs." into mnc-dr-dev 
* commit '9e0e69915a2e45dd5ba158e0436571551a672636':
  Use mount service to create user dirs.
 2015-07-13 22:34:47 +00:00
Paul Crowley
bac3d0936d Merge "Delete the user key when deleting a user." into mnc-dr-dev 2015-07-13 20:53:57 +00:00
Paul Crowley
9e0e69915a Merge "Use mount service to create user dirs." into mnc-dr-dev 2015-07-13 20:53:09 +00:00
Robin Lee
51cfb3a4d6 am 2164cf4f: am f180fe31: Merge "Legacy VPN calls to require a userID" into mnc-dev 
* commit '2164cf4f4043b4892db5688ed53624af758fcdaa':
  Legacy VPN calls to require a userID
 2015-07-10 19:32:40 +00:00
Robin Lee
f180fe31de Merge "Legacy VPN calls to require a userID" into mnc-dev 2015-07-10 19:05:38 +00:00
Raph Levien
dbcd049ac8 am 9320bb08: am 5d1654a9: Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev 
* commit '9320bb082f53dfdf34881907a736527b3bdd9b45':
  Fix StaticLayout crash when maxLines = 0
 2015-07-10 19:04:51 +00:00
Robert Greenwalt
2cef47ff86 am 66f59dc1: am 1570b6b3: Merge "Enable EMERGENCY mobile connections." into mnc-dev 
* commit '66f59dc1bde15be207d49fafb97db372cb01d977':
  Enable EMERGENCY mobile connections.
 2015-07-10 18:52:25 +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
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
2c7ed6e80a Merge "Improve ImageView drawable re-use" into mnc-dev 2015-07-10 17:50:28 +00: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
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
00c64f7ca5 Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev 2015-07-10 14:57:13 +00:00
Bart Sears
6d583ad921 am 1773f2df: am 1aa40492: Merge "Revert "Security: AccountChooser shouldn\'t auto reveal accounts."" into mnc-dev 
* commit '1773f2df50d0d36d688b9721b6c7aca4c9b3cd6e':
  Revert "Security: AccountChooser shouldn't auto reveal accounts."
 2015-07-10 03:38:58 +00:00
Eino-Ville Talvala
9dbe6b1f61 am 3aa7069b: am a2cd9c56: Merge "Camera2: Reorganize high-speed recording API slightly" into mnc-dev 
* commit '3aa7069b60ff41b5047382d64a941a6aff23de58':
  Camera2: Reorganize high-speed recording API slightly
 2015-07-10 03:38:53 +00:00
Bart Sears
1aa4049286 Merge "Revert "Security: AccountChooser shouldn't auto reveal accounts."" into mnc-dev 2015-07-10 03:15:57 +00:00
Eino-Ville Talvala
a2cd9c56f8 Merge "Camera2: Reorganize high-speed recording API slightly" into mnc-dev 2015-07-10 03:14:35 +00:00
Baligh Uddin
f2d248db80 Revert "Security: AccountChooser shouldn't auto reveal accounts." 
This reverts commit c3b3f46d5f.

Change-Id: I6d156e1ad82c052606f76644fe6085f14e82a734
 2015-07-10 03:01:47 +00:00
Carlos Valdivia
ce31576df0 am be8c3eb1: am 319883c8: Merge "Security: AccountChooser shouldn\'t auto reveal accounts." into mnc-dev 
* commit 'be8c3eb19465a2bc5162b4a26c97574f110760be':
  Security: AccountChooser shouldn't auto reveal accounts.
 2015-07-10 01:54:25 +00:00
Dianne Hackborn
6b33538053 am 47306086: am a681d7d9: Merge "Improve alarm manager docs." into mnc-dev 
* commit '4730608646b19c3c230978da09050890b3d7e380':
  Improve alarm manager docs.
 2015-07-10 01:54:17 +00:00
John Reck
19cb068505 am 31ff4513: am b7ba1220: Teach ImageView to recycle internal drawables 
* commit '31ff4513d25b215f4e36ac24c313239d25998f86':
  Teach ImageView to recycle internal drawables
 2015-07-10 01:54:08 +00:00
Svet Ganov
3ceb043fcc am b7cf986e: am 171fe6ac: Merge "Add an API for apps to query if a permisison is denied by policy." into mnc-dev 
* commit 'b7cf986eb875e7a8b4489c30b73e43a52951b4f1':
  Add an API for apps to query if a permisison is denied by policy.
 2015-07-10 01:54:04 +00:00
John Reck
f8a504fcee am 1a51a136: am 4ee9b23a: Merge "Delete dead code" into mnc-dev 
* commit '1a51a136fdabe24a26b218fd1f52197093307ce5':
  Delete dead code
 2015-07-10 01:54:00 +00:00
Carlos Valdivia
319883c80e Merge "Security: AccountChooser shouldn't auto reveal accounts." into mnc-dev 2015-07-10 01:25:36 +00:00
Dianne Hackborn
a681d7d92b Merge "Improve alarm manager docs." into mnc-dev 2015-07-10 01:19:49 +00:00
Carlos Valdivia
c3b3f46d5f Security: AccountChooser shouldn't auto reveal accounts. 
Bug: 9739125
Change-Id: Ib9032271def423aaafdab2505afaf6b1d3fcad06
 2015-07-09 18:18:22 -07:00
Dianne Hackborn
14c5ab4cb9 Improve alarm manager docs. 
Change-Id: I7547b48327a709783d908509efc7afd1a3f1a06a
 2015-07-09 18:17:54 -07:00
Eino-Ville Talvala
639fffee62 Camera2: Reorganize high-speed recording API slightly 
- Split off distinct high speed capture session class from base capture session
- Move createHighSpeedRequestList to CameraConstrainedHighSpeedCaptureSession

Bug: 21664295
Change-Id: I67d705fdeee1eaa6e5e3e1416771d5d0df642843
 2015-07-10 00:56:18 +00:00
John Reck
b7ba1220a3 Teach ImageView to recycle internal drawables 
Bug: 22289362

It's pretty common for ImageView#setBitmap to be called
repeatedly. Avoid re-creating the BitmapDrawable in this scenario
as that has high object churn of semi-expensive objects like
Paint.

Change-Id: Ib77719cd0366d02c1a42f774850bf3b9caa9c288
 2015-07-09 17:40:41 -07:00
Svet Ganov
171fe6ac0a Merge "Add an API for apps to query if a permisison is denied by policy." into mnc-dev 2015-07-10 00:32:12 +00:00
John Reck
4ee9b23a6f Merge "Delete dead code" into mnc-dev 2015-07-10 00:31:09 +00:00
Adrian Roos
1ec13f1837 am 4dfeea4f: am 4d8134c1: Merge "Fix black keyguard / missing status bar" into mnc-dev 
* commit '4dfeea4f2243b7824ca56fa8906e12c90ce979ab':
  Fix black keyguard / missing status bar
 2015-07-10 00:29:03 +00:00
Adrian Roos
4d8134c1b9 Merge "Fix black keyguard / missing status bar" into mnc-dev 2015-07-10 00:01:20 +00:00
Adrian Roos
76d2fe4288 Fix black keyguard / missing status bar 
The status bar window was stuck in the READY_TO_SHOW state
because it was not policy visible, whereas the policy
was waiting for the window to become HAS_DRAWN.

Now BarController also updates states if the window
is READY_TO_SHOW, which in turn allows the window to
become visible and HAS_DRAWN.

Bug: 22072099
Change-Id: I1836c276723ee2205d7d5759be079f02aaa23e2e
 2015-07-09 16:09:48 -07:00
Raph Levien
04a84559fd Fix StaticLayout crash when maxLines = 0 
An app setting maxLines = 0 is an edge case, but it can happen. We
had some logic that would index an array at -1 in that case. This
patch just skips the fixup of the ellipsis line break in that case.

Bug: 22353342
Change-Id: I940cf0782b319010f5aedf75b9291df4ac2976d8
 2015-07-09 15:42:34 -07:00
Dianne Hackborn
1dfeb0b2a8 am d0e005de: am 0e7d497c: Merge "Fix issue #22328792: Fix scalability issues in AssistStructure" into mnc-dev 
* commit 'd0e005de8c2ed3158b430f5867243a15c215957e':
  Fix issue #22328792: Fix scalability issues in AssistStructure
 2015-07-09 22:09:09 +00:00
Fyodor Kupolov
1e4be40109 am bda9c9f2: am a1790304: Do not return devices when caller has no location permission 
* commit 'bda9c9f266c12fd723249887fcc5230ecb6b5fc5':
  Do not return devices when caller has no location permission
 2015-07-09 22:09:05 +00:00
Robert Greenwalt
4bd4389616 Enable EMERGENCY mobile connections. 
Hooks the ConnectivityManager.TYPE_MOBILE_EMERGENCY,
PhoneConstants.APN_TYPE_EMERGENCY, and NetworkCapabilities.NET_CAPABILITY_EIMS
together so carrier apps can request connections to this APN.

bug:21785357
Change-Id: Id92a5e28d19407cc7a8f8b5478b23457f2f7f89d
 2015-07-09 14:49:35 -07:00
Dianne Hackborn
0e7d497c10 Merge "Fix issue #22328792: Fix scalability issues in AssistStructure" into mnc-dev 2015-07-09 21:48:37 +00:00
Fyodor Kupolov
a179030483 Do not return devices when caller has no location permission 
During startLeScan, do not return devices if calling process has no location
permission/appop

Bug: 21852542
Change-Id: Idce8f4704558574e373e8144390f2a2fa1a7e84a
 2015-07-09 21:38:50 +00:00
Christopher Tate
67fbc0bd15 am bf8cc192: am adebbeba: Merge "Remote extraneous debugging log message" into mnc-dev 
* commit 'bf8cc1923cd9ca5d5be6b70e2428379cb264f493':
  Remote extraneous debugging log message
 2015-07-09 21:37:00 +00:00
John Reck
7209deedcd Delete dead code 
Bug: 22378829

Every time setText is called a BoringLayout is created.
BoringLayout internally creates a new Paint called mWorkPaint.

However, creating a Paint turns out to be somewhat substantial
amount of work, and mWorkPaint is never actually used. Deleting
this shaves off roughly 50ms and 1,000 object creations during
a fling on a listview.

Change-Id: I5d03402b9027df6ce0f3e58160752c66c69a4d2d
 2015-07-09 21:25:52 +00:00
Dianne Hackborn
782d498268 Fix issue #22328792: Fix scalability issues in AssistStructure 
We can now stream the AssistStructure across processes, avoiding
IPC size limitations for large structures.  There is also a new
API that gets called on the VoiceInteractionSession if there is
a failure retrieving the assist data.

Also fix issue #22351981: Runtime restart due to ANR in system server,
getting rid of a deadlock.

And also tweak object lifecycles to try to avoid keeping around
in an app the previous AssistStructure after we request a new one.

Change-Id: Ifb136a0d31a14e56a8db6b90768d9fc65557a17f
 2015-07-09 14:06:47 -07:00
Christopher Tate
adebbebaa7 Merge "Remote extraneous debugging log message" into mnc-dev 2015-07-09 21:04:32 +00:00
Jeff Brown
8e4dde2c80 am 2ad03d0c: am c1aebfa0: Merge "Clean up USB Manager and fix ADB." into mnc-dev 
* commit '2ad03d0c3275c902d6c86dcef8f4bd91183d397f':
  Clean up USB Manager and fix ADB.
 2015-07-09 20:28:06 +00:00
Raph Levien
0d18477a28 am 75d6197e: am 968f9fdf: Merge "Slightly more precise RTL check in BoringLayout.isBoring()" into mnc-dev 
* commit '75d6197ee827c1cb229977d8e7fe4754bbbe0c43':
  Slightly more precise RTL check in BoringLayout.isBoring()
 2015-07-09 20:28:02 +00:00
Jeff Brown
c1aebfa02c Merge "Clean up USB Manager and fix ADB." into mnc-dev 2015-07-09 20:03:29 +00:00
Raph Levien
968f9fdf8b Merge "Slightly more precise RTL check in BoringLayout.isBoring()" into mnc-dev 2015-07-09 19:56:20 +00:00