Carlos Valdivia
be8c3eb194
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:43:34 +00:00
Adrian Roos
78da75c379
am 83e9525c: Merge "Fix premature clearing of clearable sysui flags" into mnc-dev
...
* commit '83e9525c614d4a959c5f243bcda9a75057930339':
Fix premature clearing of clearable sysui flags
2015-07-10 01:43:30 +00:00
Dianne Hackborn
4730608646
am a681d7d9: Merge "Improve alarm manager docs." into mnc-dev
...
* commit 'a681d7d92b6938194d5670a11b79486365cbcd72':
Improve alarm manager docs.
2015-07-10 01:43:23 +00:00
John Reck
31b81b3cb9
am 6ed4b9df: Merge "Deep-copying sucks when all you want is a borrow" into mnc-dev
...
* commit '6ed4b9dfd6130f4517af5a99d99c5cb125600baa':
Deep-copying sucks when all you want is a borrow
2015-07-10 01:43:18 +00:00
John Reck
31ff4513d2
am b7ba1220: Teach ImageView to recycle internal drawables
...
* commit 'b7ba1220a3dc3012d2e22825eaeb0e643333f5a4':
Teach ImageView to recycle internal drawables
2015-07-10 01:43:13 +00:00
Svet Ganov
b7cf986eb8
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:43:03 +00:00
John Reck
1a51a136fd
am 4ee9b23a: Merge "Delete dead code" into mnc-dev
...
* commit '4ee9b23a6f1856bfe7fa810b585b4ced02745d65':
Delete dead code
2015-07-10 01:42:58 +00:00
David Friedman
becb4164d8
am a70109e4: am 019a0943: Docs: Fixes a typo.
...
* commit 'a70109e4cc21a58649716e8b4fcf2a7c63274f04':
Docs: Fixes a typo.
2015-07-10 01:31:06 +00:00
Dirk Dougherty
d75391e093
am 8d56096b: am f739ad7f: Fix typos in preview support.
...
* commit '8d56096b59dbbcfd18ab137309fe203cca0033d8':
Fix typos in preview support.
2015-07-10 01:30:49 +00:00
Carlos Valdivia
319883c80e
Merge "Security: AccountChooser shouldn't auto reveal accounts." into mnc-dev
2015-07-10 01:25:36 +00:00
Adrian Roos
3ab00aca46
am 8ca082c7: am 0dc7f44c: am 1ec13f18: am 4dfeea4f: am 4d8134c1: Merge "Fix black keyguard / missing status bar" into mnc-dev
...
* commit '8ca082c74b908caaa88e6cee47e052d1e8122440':
Fix black keyguard / missing status bar
2015-07-10 01:25:04 +00:00
Adrian Roos
83e9525c61
Merge "Fix premature clearing of clearable sysui flags" into mnc-dev
2015-07-10 01:24:48 +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
John Reck
6ed4b9dfd6
Merge "Deep-copying sucks when all you want is a borrow" into mnc-dev
2015-07-10 01:02:40 +00: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
Todd Kennedy
a17b7f8c4b
am 959b5502: am 4c1d9480: am 32eaa610: am 948a3ed9: am d80cf910: Merge "Allow codepath changes for new OTA packages" into mnc-dev
...
* commit '959b55020d4c47ca7e42bece6cd48ef10c1c1c31':
Allow codepath changes for new OTA packages
2015-07-10 00:56:09 +00:00
John Reck
bea77a0783
Deep-copying sucks when all you want is a borrow
...
Bug: 22378829
std::string only knows how to move & deep-copy, and we really
don't want either here since the Paint object for certain outlives
the stack scope so use a const reference instead.
Change-Id: I1c822c6ba9647953899cfe89dcc670d7265e3973
2015-07-09 17:47:50 -07:00
Adrian Roos
0dc7f44c1f
am 1ec13f18: am 4dfeea4f: am 4d8134c1: Merge "Fix black keyguard / missing status bar" into mnc-dev
...
* commit '1ec13f183773129f61aa541ea237f53576136790':
Fix black keyguard / missing status bar
2015-07-10 00:43:44 +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
Todd Kennedy
959b55020d
am 4c1d9480: am 32eaa610: am 948a3ed9: am d80cf910: Merge "Allow codepath changes for new OTA packages" into mnc-dev
...
* commit '4c1d9480f44120543b0c1ed8ea04b6a22b55011b':
Allow codepath changes for new OTA packages
2015-07-10 00:26:56 +00:00
Adrian Roos
4dfeea4f22
am 4d8134c1: Merge "Fix black keyguard / missing status bar" into mnc-dev
...
* commit '4d8134c1b9e11c2b3a92195fb753da7b144bad1e':
Fix black keyguard / missing status bar
2015-07-10 00:15:25 +00:00
Adrian Roos
4d8134c1b9
Merge "Fix black keyguard / missing status bar" into mnc-dev
2015-07-10 00:01:20 +00:00
Todd Kennedy
4c1d9480f4
am 32eaa610: am 948a3ed9: am d80cf910: Merge "Allow codepath changes for new OTA packages" into mnc-dev
...
* commit '32eaa6104ed7376e3880fc3d139ed2ef6ac881c1':
Allow codepath changes for new OTA packages
2015-07-09 23:54:34 +00:00
Todd Kennedy
32eaa6104e
am 948a3ed9: am d80cf910: Merge "Allow codepath changes for new OTA packages" into mnc-dev
...
* commit '948a3ed9bc289c17ada0a5eeb9dffb2314e924a5':
Allow codepath changes for new OTA packages
2015-07-09 23:42:19 +00:00
Dianne Hackborn
b6fbe91a02
am 782e31df: am 2dc2cdc0: am 1dfeb0b2: am d0e005de: am 0e7d497c: Merge "Fix issue #22328792 : Fix scalability issues in AssistStructure" into mnc-dev
...
* commit '782e31dfcc448eaaab814fd76f42c3390a952037':
Fix issue #22328792 : Fix scalability issues in AssistStructure
2015-07-09 23:29:51 +00:00
Fyodor Kupolov
be5494eee4
am 25864da0: am 9f73cd92: am 1e4be401: am bda9c9f2: am a1790304: Do not return devices when caller has no location permission
...
* commit '25864da0bccd37ecd26c6e2ffe474a338af544ca':
Do not return devices when caller has no location permission
2015-07-09 23:29:44 +00:00
Christopher Tate
8bbd9ac746
am 531209d2: am 06566db8: am 67fbc0bd: am bf8cc192: am adebbeba: Merge "Remote extraneous debugging log message" into mnc-dev
...
* commit '531209d29cd571254248cdc706bdd4dc297bc331':
Remote extraneous debugging log message
2015-07-09 23:29:37 +00:00
Jeff Brown
7ea04057ad
am 22a86ce4: am 5682d53f: am 43dc8e5e: am 8a5252fb: am 2a67840c: Fix a bad merge.
...
* commit '22a86ce49e66bee2c1cd2e6013718cf1fc6ff40b':
Fix a bad merge.
2015-07-09 23:29:29 +00:00
Andres Morales
2c4a573f38
[LockSettings] fail hard when there's an error enrolling
...
Soft failing causes state to go out of whack
Bug: 22367550
Change-Id: I9f078cf1c39c35913c672741d8fb1be0b9c8c9e8
2015-07-09 23:29:26 +00:00
Todd Kennedy
948a3ed9bc
am d80cf910: Merge "Allow codepath changes for new OTA packages" into mnc-dev
...
* commit 'd80cf9109aa6b560e473f0197034085ed9062eaa':
Allow codepath changes for new OTA packages
2015-07-09 23:26:36 +00:00
Adrian Roos
01f2d1ac7e
Fix premature clearing of clearable sysui flags
...
Fixes a bug where all clearable flags would be cleared even if
only a subset actually changes; new behavior is clearing only
the flags that actually got cleared.
Bug: 22331526
Change-Id: Icbb12121c977e48457692c054571521c6f6eb730
2015-07-09 16:22:24 -07:00
Todd Kennedy
d80cf9109a
Merge "Allow codepath changes for new OTA packages" into mnc-dev
2015-07-09 23:17:40 +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
Jeff Brown
22a86ce49e
am 5682d53f: am 43dc8e5e: am 8a5252fb: am 2a67840c: Fix a bad merge.
...
* commit '5682d53fd547a9fd4b3a14a76c33f427f5ccd9ed':
Fix a bad merge.
2015-07-09 23:12:17 +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
2dc2cdc026
am 1dfeb0b2: am d0e005de: am 0e7d497c: Merge "Fix issue #22328792 : Fix scalability issues in AssistStructure" into mnc-dev
...
* commit '1dfeb0b2a8a5067b3ed153e19ddf812ccf8f642b':
Fix issue #22328792 : Fix scalability issues in AssistStructure
2015-07-09 23:02:35 +00:00
Fyodor Kupolov
9f73cd92d3
am 1e4be401: am bda9c9f2: am a1790304: Do not return devices when caller has no location permission
...
* commit '1e4be40109db63d23556612eb247cf2b3e4542e9':
Do not return devices when caller has no location permission
2015-07-09 23:02:29 +00:00
Christopher Tate
06566db8aa
am 67fbc0bd: am bf8cc192: am adebbeba: Merge "Remote extraneous debugging log message" into mnc-dev
...
* commit '67fbc0bd15675ff31ce76819504f08e14932bfaa':
Remote extraneous debugging log message
2015-07-09 23:02:10 +00:00
Jeff Brown
5682d53fd5
am 43dc8e5e: am 8a5252fb: am 2a67840c: Fix a bad merge.
...
* commit '43dc8e5ecefa7bb75b5f5223cc407e5e48af7ec2':
Fix a bad merge.
2015-07-09 23:01:54 +00:00
Jeff Brown
d6efafcf90
am 0bff26c1: am 9c22afe8: Fix a bad merge.
...
* commit '0bff26c1e9f96857fced59e42a6dac67c14a5597':
Fix a bad merge.
2015-07-09 22:43:28 +00:00
Jeff Brown
0bff26c1e9
am 9c22afe8: Fix a bad merge.
...
* commit '9c22afe8538cd8c849d0393751bf5bc4997bc632':
Fix a bad merge.
2015-07-09 22:30:24 +00:00
Jeff Brown
9c22afe853
Fix a bad merge.
...
Change-Id: Ib722459a25c189bb800eb85d48b80bdc91a2b7db
(cherry picked from commit 2a67840c3c35a6267663e5d3ae921ee9ac614db9)
2015-07-09 22:21:50 +00:00