Commit Graph

54375 Commits

Author SHA1 Message Date
Chris Craik
0fa464e7f5 am 9f004920: Merge "Reduce cost of span type checking" into mnc-dev
* commit '9f0049200824ae523a6cd39b9866c709d42e3075':
  Reduce cost of span type checking
2015-07-13 07:19:10 +00:00
Chris Craik
9f00492008 Merge "Reduce cost of span type checking" into mnc-dev 2015-07-10 22:44:28 +00:00
Chris Craik
fc121c2430 Reduce cost of span type checking
bug:22378829

Change-Id: I1da5154b2fb4f5032eaed44586d5470d28ceb45b
2015-07-10 13:12:35 -07:00
Robin Lee
dcc4b2597f am f180fe31: Merge "Legacy VPN calls to require a userID" into mnc-dev
* commit 'f180fe31de4cc428c298a2faed394c417ade5483':
  Legacy VPN calls to require a userID
2015-07-10 19:17:06 +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
3991abf987 am 5d1654a9: Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev
* commit '5d1654a9439f0ed81ecccecfacda34872270dfcb':
  Fix StaticLayout crash when maxLines = 0
2015-07-10 18:48:57 +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
313e8adfd0 am 1570b6b3: Merge "Enable EMERGENCY mobile connections." into mnc-dev
* commit '1570b6b3c7d1d41a52555312d161d0afe4b81df3':
  Enable EMERGENCY mobile connections.
2015-07-10 18:34:40 +00:00
Robert Greenwalt
1570b6b3c7 Merge "Enable EMERGENCY mobile connections." into mnc-dev 2015-07-10 18:23:24 +00:00
John Reck
d179ca49ea am 2c7ed6e8: Merge "Improve ImageView drawable re-use" into mnc-dev
* commit '2c7ed6e80a7e9504a0c0e13a27e54332c603d1cc':
  Improve ImageView drawable re-use
2015-07-10 17:59:37 +00:00
John Reck
2c7ed6e80a Merge "Improve ImageView drawable re-use" into mnc-dev 2015-07-10 17:50:28 +00:00
Paul Jensen
9c2df94fbc 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 17:33:43 +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
Bart Sears
b7508fc159 am 1aa40492: Merge "Revert "Security: AccountChooser shouldn\'t auto reveal accounts."" into mnc-dev
* commit '1aa4049286e7ed1272ce84619f41c13a4d217395':
  Revert "Security: AccountChooser shouldn't auto reveal accounts."
2015-07-10 17:00:04 +00:00
Eino-Ville Talvala
aebf04e5df am a2cd9c56: Merge "Camera2: Reorganize high-speed recording API slightly" into mnc-dev
* commit 'a2cd9c56f8648b5a4faee14d9dd0c4151730f78c':
  Camera2: Reorganize high-speed recording API slightly
2015-07-10 16:59:57 +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
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
5e424a9854 am 319883c8: Merge "Security: AccountChooser shouldn\'t auto reveal accounts." into mnc-dev
* commit '319883c80e13ca980b2721a947805cde1999f204':
  Security: AccountChooser shouldn't auto reveal accounts.
2015-07-10 01:45:31 +00:00
Dianne Hackborn
40d23c1a26 am a681d7d9: Merge "Improve alarm manager docs." into mnc-dev
* commit 'a681d7d92b6938194d5670a11b79486365cbcd72':
  Improve alarm manager docs.
2015-07-10 01:45:17 +00:00
John Reck
c2d0d09015 am b7ba1220: Teach ImageView to recycle internal drawables
* commit 'b7ba1220a3dc3012d2e22825eaeb0e643333f5a4':
  Teach ImageView to recycle internal drawables
2015-07-10 01:45:02 +00:00
Svet Ganov
1d8cf5316c am 171fe6ac: Merge "Add an API for apps to query if a permisison is denied by policy." into mnc-dev
* commit '171fe6ac0aa5b0d2dd64ac1cdda25cdcb5f183f3':
  Add an API for apps to query if a permisison is denied by policy.
2015-07-10 01:44:45 +00:00
John Reck
75bcfeabb9 am 4ee9b23a: Merge "Delete dead code" into mnc-dev
* commit '4ee9b23a6f1856bfe7fa810b585b4ced02745d65':
  Delete dead code
2015-07-10 01:44:38 +00:00
Adrian Roos
172d48cf87 am 4d8134c1: Merge "Fix black keyguard / missing status bar" into mnc-dev
* commit '4d8134c1b9e11c2b3a92195fb753da7b144bad1e':
  Fix black keyguard / missing status bar
2015-07-10 01:44:21 +00:00
Dianne Hackborn
cc9648500c am 0e7d497c: Merge "Fix issue #22328792: Fix scalability issues in AssistStructure" into mnc-dev
* commit '0e7d497c10c4f5096cf4cd32a56784fd18ab0f2c':
  Fix issue #22328792: Fix scalability issues in AssistStructure
2015-07-10 01:43:39 +00:00
Fyodor Kupolov
9be2a462c8 am a1790304: Do not return devices when caller has no location permission
* commit 'a179030483a1f3f672be41797dc6e0f077ef4748':
  Do not return devices when caller has no location permission
2015-07-10 01:43:31 +00:00
Christopher Tate
e41a21e1c2 am adebbeba: Merge "Remote extraneous debugging log message" into mnc-dev
* commit 'adebbebaa7d516628b5946dd023ff8726e75d2b0':
  Remote extraneous debugging log message
2015-07-10 01:43:05 +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
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
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
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
cb23b7e89b am c1aebfa0: Merge "Clean up USB Manager and fix ADB." into mnc-dev
* commit 'c1aebfa02c393471fb344c3a94ee2ae62bb78f93':
  Clean up USB Manager and fix ADB.
2015-07-09 20:10:26 +00:00
Raph Levien
021ee214c1 am 968f9fdf: Merge "Slightly more precise RTL check in BoringLayout.isBoring()" into mnc-dev
* commit '968f9fdf8b2042b4d7b408f4b2a9db5008eaca6e':
  Slightly more precise RTL check in BoringLayout.isBoring()
2015-07-09 20:10:18 +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
Jeff Brown
460a146eb8 Clean up USB Manager and fix ADB.
Moved functions which parse the USB functions list into one common
place on UsbManager.

Deleted the no longer supported USB_FUNCTION_MASS_STORAGE.

Ensured that the UserManager.DISALLOW_USB_FILE_TRANSFER rule is
consistently applied during user switch and when changing the
current USB functions and make sure it only affects MTP and PTP.

Collapsed the boot completed and user switched receivers to
ensure consistent ordering of side-effects.

Validate the list of functions passed to setCurrentFunction() so
that the separation of concerns is clearer.  It was somewhat
ambiguous as to whether functions such as ADB could / should be
enabled through that interface.  Improved the docs for clarity.

Fixed a bunch of broken stuff related to the USB config
persistent property (list of default functions) that could cause
ADB and other functions to not work at all.  Added new failsafes
to ensure that we reliably get back into a happy state.

Bug: 22206076
Change-Id: I02915ddfce7193a8f67a14f0d76bab22fc575dfa
2015-07-09 12:55:56 -07:00