Paul Crowley
4e1174d9a7
am 7b6493a7: am 62d43bd9: am 9e0e6991: Merge "Use mount service to create user dirs." into mnc-dr-dev
...
* commit '7b6493a7b7da70610735b87c30f0c2c9d0cf0ea1':
Use mount service to create user dirs.
2015-07-13 23:50:58 +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
9e0e69915a
Merge "Use mount service to create user dirs." into mnc-dr-dev
2015-07-13 20:53:09 +00:00
Neil Fuller
b662579ec0
am 3ecbca50: am 886630c0: Merge "Switch shutdownInput / shutdownOutput to using Os.shutdown."
...
* commit '3ecbca5081f26ca03ef6b8b68767753343e67f38':
Switch shutdownInput / shutdownOutput to using Os.shutdown.
2015-07-13 15:26:09 +00:00
Robin Lee
f8b96edf47
am 81093dd0: am 51cfb3a4: am 2164cf4f: am f180fe31: Merge "Legacy VPN calls to require a userID" into mnc-dev
...
* commit '81093dd04bc1fdfe1f7389baefb891122e232ff9':
Legacy VPN calls to require a userID
2015-07-10 20:03:02 +00:00
Raph Levien
8b21d785af
am c10176a4: am dbcd049a: am 9320bb08: am 5d1654a9: Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev
...
* commit 'c10176a419b4b95a64d9d20e5137c545a4472747':
Fix StaticLayout crash when maxLines = 0
2015-07-10 19:33:05 +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
Robert Greenwalt
cc5cd90029
am e84c6b37: am 2cef47ff: am 66f59dc1: am 1570b6b3: Merge "Enable EMERGENCY mobile connections." into mnc-dev
...
* commit 'e84c6b37f4859371e274b30035a1a5ec04307f66':
Enable EMERGENCY mobile connections.
2015-07-10 19:17:55 +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
John Reck
5159f778f0
am f01a4710: am 1e2063fb: am d1b16386: am 2c7ed6e8: Merge "Improve ImageView drawable re-use" into mnc-dev
...
* commit 'f01a471060df22ee5c92acdf8effa340b5f568b3':
Improve ImageView drawable re-use
2015-07-10 18:42:54 +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
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
Neil Fuller
a7f7c248c7
Switch shutdownInput / shutdownOutput to using Os.shutdown.
...
Bug: 3106438
Change-Id: I2c4817e435c6b253d6c507ea57bdfdfe45df8862
2015-07-10 12:30:07 +01: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