Commit Graph

54390 Commits

Author SHA1 Message Date
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
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
1893e12f9c am 19dd9c9c: am 6d583ad9: am 1773f2df: am 1aa40492: Merge "Revert "Security: AccountChooser shouldn\'t auto reveal accounts."" into mnc-dev
* commit '19dd9c9c99fed36562747b0da856c8aca606a7e5':
  Revert "Security: AccountChooser shouldn't auto reveal accounts."
2015-07-10 04:03:50 +00:00
Eino-Ville Talvala
440cfa8876 am 9bc8438e: am 9dbe6b1f: am 3aa7069b: am a2cd9c56: Merge "Camera2: Reorganize high-speed recording API slightly" into mnc-dev
* commit '9bc8438e39e220b33a76382e6d54ed15cef3fe42':
  Camera2: Reorganize high-speed recording API slightly
2015-07-10 04:03:43 +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
fa64423897 am 5338a34b: am ce31576d: am be8c3eb1: am 319883c8: Merge "Security: AccountChooser shouldn\'t auto reveal accounts." into mnc-dev
* commit '5338a34b4dbdc0c095937b572240b9ad9ebea51f':
  Security: AccountChooser shouldn't auto reveal accounts.
2015-07-10 02:23:57 +00:00
Dianne Hackborn
8e697eb131 am 04efda69: am 6b335380: am 47306086: am a681d7d9: Merge "Improve alarm manager docs." into mnc-dev
* commit '04efda693713243a47afb193ae389d5d36ff5dfa':
  Improve alarm manager docs.
2015-07-10 02:23:46 +00:00
John Reck
66e8634787 am 035e1b94: am 19cb0685: am 31ff4513: am b7ba1220: Teach ImageView to recycle internal drawables
* commit '035e1b94ea25d78be562add377ee85a952caafa3':
  Teach ImageView to recycle internal drawables
2015-07-10 02:23:30 +00:00
Svet Ganov
0bdfb97a0a am 88c3918d: am 3ceb043f: am b7cf986e: am 171fe6ac: Merge "Add an API for apps to query if a permisison is denied by policy." into mnc-dev
* commit '88c3918d00ba7eed22ce20e80dde44b34f552d76':
  Add an API for apps to query if a permisison is denied by policy.
2015-07-10 02:23:25 +00:00
John Reck
12c62e117c am 0739ebcb: am f8a504fc: am 1a51a136: am 4ee9b23a: Merge "Delete dead code" into mnc-dev
* commit '0739ebcbcf7cca4c6f1bb05ed0eb762c1d3a9b93':
  Delete dead code
2015-07-10 02:23:19 +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
Adrian Roos
8ca082c74b am 0dc7f44c: am 1ec13f18: am 4dfeea4f: am 4d8134c1: Merge "Fix black keyguard / missing status bar" into mnc-dev
* commit '0dc7f44c1f454f57e344084c5631c6c3b9727c0e':
  Fix black keyguard / missing status bar
2015-07-10 00:59:31 +00: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
Dianne Hackborn
782e31dfcc am 2dc2cdc0: am 1dfeb0b2: am d0e005de: am 0e7d497c: Merge "Fix issue #22328792: Fix scalability issues in AssistStructure" into mnc-dev
* commit '2dc2cdc026e8494c09f0cc44205cf22f513b78eb':
  Fix issue #22328792: Fix scalability issues in AssistStructure
2015-07-09 23:12:33 +00:00
Fyodor Kupolov
25864da0bc am 9f73cd92: am 1e4be401: am bda9c9f2: am a1790304: Do not return devices when caller has no location permission
* commit '9f73cd92d3e493cfc93b2cf85b58a186750f75e7':
  Do not return devices when caller has no location permission
2015-07-09 23:12:28 +00:00
Christopher Tate
531209d29c am 06566db8: am 67fbc0bd: am bf8cc192: am adebbeba: Merge "Remote extraneous debugging log message" into mnc-dev
* commit '06566db8aa981d3d2d10d25724c54f9f54a1c98e':
  Remote extraneous debugging log message
2015-07-09 23:12:22 +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
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
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
5c43bb82e4 am f19abb67: am 8e4dde2c: am 2ad03d0c: am c1aebfa0: Merge "Clean up USB Manager and fix ADB." into mnc-dev
* commit 'f19abb67c2604c06b140979cb527c599c37d02f4':
  Clean up USB Manager and fix ADB.
2015-07-09 20:56:00 +00:00
Raph Levien
756b5ff6a9 am 5ab41065: am 0d18477a: am 75d6197e: am 968f9fdf: Merge "Slightly more precise RTL check in BoringLayout.isBoring()" into mnc-dev
* commit '5ab41065ebfa87a6d44015799bedfe6186d8e784':
  Slightly more precise RTL check in BoringLayout.isBoring()
2015-07-09 20:55:54 +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
Jorim Jaggi
46e30763df am 5175b3c9: am 9acf475c: am 35094376: am 3cc5c24b: Merge "Fix assist for hardware long-press" into mnc-dev
* commit '5175b3c9923f5eaf5eafa01798966f8711ce9547':
  Fix assist for hardware long-press
2015-07-09 20:16:30 +00:00
Jeff Brown
c1aebfa02c Merge "Clean up USB Manager and fix ADB." into mnc-dev 2015-07-09 20:03:29 +00:00
Julia Reynolds
2ebd9a9cfc am 17364a23: am 07ea25a7: am 68e4d688: am 279678e1: Merge "Show a default icon for permissions that lack a group." into mnc-dev
* commit '17364a23929bdfeaa9bda3cbf5c71519268b1a3a':
  Show a default icon for permissions that lack a group.
2015-07-09 19:58:00 +00:00