OSDN Git Service
Matthew Fritze [Thu, 21 Jul 2016 01:24:02 +0000 (01:24 +0000)]
Merge \"Revert \"Revert \"Error colors to point to frameworks rather than hard-code them\"\"\" into nyc-mr1-dev
am:
9e7bd8de87
Change-Id: Ie9d9f4864c0e85375dace272cb9e389b3f02c573
Matthew Fritze [Thu, 21 Jul 2016 01:06:10 +0000 (01:06 +0000)]
Merge \"Revert \"Error colors to point to frameworks rather than hard-code them\"\" into nyc-mr1-dev
am:
22d09743d8
Change-Id: If9113aab011035227930b2df6b68341ee3774bd3
Matthew Fritze [Thu, 21 Jul 2016 01:04:23 +0000 (01:04 +0000)]
Merge "Revert "Revert "Error colors to point to frameworks rather than hard-code them""" into nyc-mr1-dev
Matthew Fritze [Thu, 21 Jul 2016 00:59:33 +0000 (00:59 +0000)]
Revert "Revert "Error colors to point to frameworks rather than hard-code them""
This reverts commit
7c11e933d540b27d596a1536ffbb75007e24a7e6.
Change-Id: I79ecbc39a78f17d22ec20097cfba213de5e30b5e
Andrew Sapperstein [Thu, 21 Jul 2016 00:57:01 +0000 (00:57 +0000)]
Merge "Revert "Error colors to point to frameworks rather than hard-code them"" into nyc-mr1-dev
Matthew Fritze [Thu, 21 Jul 2016 00:55:53 +0000 (00:55 +0000)]
Revert "Error colors to point to frameworks rather than hard-code them"
This reverts commit
43f762a0263b7da464c29c139fa6bfc91ec1713d.
Change-Id: If328c2e6983a2dd2295d83f17edbaaa3cc149b60
Chris Craik [Thu, 21 Jul 2016 00:39:44 +0000 (00:39 +0000)]
Merge \"Change swap chain stuffed detection logic\" into nyc-mr1-dev
am:
433a19e8bf
Change-Id: I6942a7cef5c831a1be3ee0252c2f475594f3db39
Amith Yamasani [Thu, 21 Jul 2016 00:30:26 +0000 (00:30 +0000)]
Merge \"Allow calling in demo mode\" into nyc-mr1-dev
am:
8c8d752851
Change-Id: I484fb7003f4a3f4ab967d19fc761973eb0c6c233
Chris Craik [Thu, 21 Jul 2016 00:26:14 +0000 (00:26 +0000)]
Merge "Change swap chain stuffed detection logic" into nyc-mr1-dev
Amith Yamasani [Thu, 21 Jul 2016 00:21:12 +0000 (00:21 +0000)]
Merge "Allow calling in demo mode" into nyc-mr1-dev
Matthew Fritze [Wed, 20 Jul 2016 23:47:23 +0000 (23:47 +0000)]
Merge \"Error colors to point to frameworks rather than hard-code them\" into nyc-mr1-dev
am:
948400a43d
Change-Id: Ibeca72659bbd13b1a5a8bdb009fc6a5021f8acbf
Chris Craik [Wed, 20 Jul 2016 00:59:12 +0000 (17:59 -0700)]
Change swap chain stuffed detection logic
bug:
29771461
bug:
29413700
bug:
30181577
Changes frame interval gap detection to look for wider gaps, as they
were incorrectly firing all the time.
Also adds a 500ms minimum gap between frames dropped because of stuffed
swap chain, to prevent dropping too often.
Change-Id: If16ed637d54bf37015704be102c5c2e3731a0824
Adrian Roos [Wed, 20 Jul 2016 23:41:14 +0000 (23:41 +0000)]
Merge \"Direct Reply: Allow closing IME separately from DirectReply mode\" into nyc-mr1-dev
am:
01acf40e0f
Change-Id: I0d38aca1c53c31e54819979eafd2f2dc37b2071a
Matthew Fritze [Wed, 20 Jul 2016 23:34:40 +0000 (23:34 +0000)]
Merge "Error colors to point to frameworks rather than hard-code them" into nyc-mr1-dev
TreeHugger Robot [Wed, 20 Jul 2016 23:29:17 +0000 (23:29 +0000)]
Merge "Direct Reply: Allow closing IME separately from DirectReply mode" into nyc-mr1-dev
Doris Liu [Wed, 20 Jul 2016 23:15:43 +0000 (23:15 +0000)]
Merge \"Fix VD animator not being properly resumed\" into nyc-mr1-dev
am:
ffa880b83f
Change-Id: Ie10f5c12f528fb3d07765d724ee2a59138863906
Michael Kwan [Wed, 20 Jul 2016 23:15:33 +0000 (23:15 +0000)]
Merge \"Fix crash on devices with 1.2\" screens.\" into nyc-mr1-dev
am:
70a789f569
Change-Id: I18e99a65c5a8aeafe75f2a872ac39c8a4ac4f5a4
Doris Liu [Wed, 20 Jul 2016 23:10:52 +0000 (23:10 +0000)]
Merge "Fix VD animator not being properly resumed" into nyc-mr1-dev
Makoto Onuki [Wed, 20 Jul 2016 23:09:55 +0000 (23:09 +0000)]
Merge \"Support multiple intents in ShortcutInfo\" into nyc-mr1-dev
am:
b84ce2e034
Change-Id: I53daa680bdf18505896a372e59c7b4bd73d4edca
Chris Thornton [Wed, 20 Jul 2016 23:09:42 +0000 (23:09 +0000)]
Merge \"SoundTriggerHelpoer: Send pause events on abort if a model is running.\" into nyc-mr1-dev
am:
d661476c98
Change-Id: Ie470d782d3e16a440c345a444d4eb29cebec34b4
Michael Kwan [Wed, 20 Jul 2016 23:08:04 +0000 (23:08 +0000)]
Merge "Fix crash on devices with 1.2" screens." into nyc-mr1-dev
Makoto Onuki [Wed, 20 Jul 2016 23:05:29 +0000 (23:05 +0000)]
Merge "Support multiple intents in ShortcutInfo" into nyc-mr1-dev
TreeHugger Robot [Wed, 20 Jul 2016 23:05:20 +0000 (23:05 +0000)]
Merge "SoundTriggerHelpoer: Send pause events on abort if a model is running." into nyc-mr1-dev
Christopher Tate [Wed, 20 Jul 2016 22:58:03 +0000 (22:58 +0000)]
Merge \"Run the SELinux wallpaper restorecon operations on all users\" into nyc-mr1-dev
am:
bf9fa8280e
Change-Id: I06a8e2f5510f019f6c553a7b26ce602a690f9732
Chris Tate [Wed, 20 Jul 2016 22:45:10 +0000 (22:45 +0000)]
Merge "Run the SELinux wallpaper restorecon operations on all users" into nyc-mr1-dev
Michael Kwan [Wed, 20 Jul 2016 22:12:02 +0000 (15:12 -0700)]
Fix crash on devices with 1.2" screens.
Bug:
30109315
Change-Id: Ia28f6dfcb833db966cc33ad289b5c7b5867b2407
Christopher Tate [Wed, 20 Jul 2016 22:10:18 +0000 (15:10 -0700)]
Run the SELinux wallpaper restorecon operations on all users
And only run them once per device boot lifetime.
Bug
30229410
Change-Id: Ia6f7f7eea7f8985c83b531dfa16e96d08235b901
Adam Lesinski [Wed, 20 Jul 2016 22:05:38 +0000 (22:05 +0000)]
Merge \"BatteryStats: Don\'t print empty platform idle state\" into nyc-mr1-dev
am:
ebbbead915
Change-Id: Ia651ad5a0a183ff7d70d90f119ec9238c15711ad
Adrian Roos [Mon, 18 Jul 2016 21:23:32 +0000 (14:23 -0700)]
Direct Reply: Allow closing IME separately from DirectReply mode
If the IME is showing, the first BACK now closes just
the IME instead of also closing the Direct Reply mode.
Subsequent back closes the notification panel as usual.
Change-Id: Ic4b5a4d6b528a211c2fa0c8b5ceb0f7017c09400
Fixes:
29996385
Adrian Roos [Wed, 20 Jul 2016 22:00:35 +0000 (22:00 +0000)]
Merge \"Direct Reply: Fix circular reveal origin\" into nyc-mr1-dev
am:
c50f8ae532
Change-Id: Ib3083e87f162a103acc6483b0f3367db73e1b269
TreeHugger Robot [Wed, 20 Jul 2016 21:56:01 +0000 (21:56 +0000)]
Merge "BatteryStats: Don't print empty platform idle state" into nyc-mr1-dev
Adrian Roos [Wed, 20 Jul 2016 21:49:02 +0000 (21:49 +0000)]
Merge "Direct Reply: Fix circular reveal origin" into nyc-mr1-dev
Makoto Onuki [Wed, 20 Jul 2016 21:21:18 +0000 (14:21 -0700)]
Support multiple intents in ShortcutInfo
Also fix b/
30230996.
TODO: Support the sourceBounds argument to LauncherApps.
startShortcut().
Bug
30218829
Bug
30230996
Change-Id: Ibb6c59d5b7c0a320c21d09436d016d0eac94644f
Chris Thornton [Wed, 20 Jul 2016 01:56:15 +0000 (18:56 -0700)]
SoundTriggerHelpoer: Send pause events on abort if a model is running.
If the recognition was aborted due to the service state being set to
false, clients were not made aware that the model had been stopped (but
would get a resume event).
Bug:
30233664
Change-Id: I9f663362ff142eadfd5ef727c5f0c941f8e9e89d
Ye Wen [Wed, 20 Jul 2016 21:22:05 +0000 (21:22 +0000)]
Merge \"Add carrier config for close connection after MMS request\" into nyc-mr1-dev
am:
f2598319c0
Change-Id: Ia16874474f755b601a02032e34b8dbff81971af8
Ye Wen [Wed, 20 Jul 2016 21:17:51 +0000 (21:17 +0000)]
Merge "Add carrier config for close connection after MMS request" into nyc-mr1-dev
Suprabh Shukla [Wed, 20 Jul 2016 21:01:09 +0000 (21:01 +0000)]
Merge \"Setting a system property when device goes into demo mode\" into nyc-mr1-dev
am:
24db3ab8b9
Change-Id: Iadedc063f7058a7d1f22e0151a8ebfc9a6a8dff1
Matthew Fritze [Tue, 19 Jul 2016 20:13:41 +0000 (13:13 -0700)]
Error colors to point to frameworks rather than hard-code them
Rather than have each instance of the system error color hard code
the argb values, they now point to frameworks/base/core/res.
Change-Id: Ia203ff6966cd58a3bc23eb883460f0f8abb050f5
Fixes:
30021554
TreeHugger Robot [Wed, 20 Jul 2016 20:52:45 +0000 (20:52 +0000)]
Merge "Setting a system property when device goes into demo mode" into nyc-mr1-dev
Julia Reynolds [Wed, 20 Jul 2016 20:45:13 +0000 (20:45 +0000)]
Merge \"Snooze schedule rules that were canceled by alarms.\" into nyc-mr1-dev
am:
ae0aed951b
Change-Id: I18bd8e7528a6c24f350c97268b26fe91ef198290
Doris Liu [Wed, 20 Jul 2016 02:04:31 +0000 (19:04 -0700)]
Fix VD animator not being properly resumed
VectorDrawable animators remove themselves from RenderThread's
animator list when they detect their target not being in the
DisplayList. When the target got added back into DisplayList
without an invalidation(), the animators were not added to
the running animator list, therefore didn't continue to run.
This CL detects for the case where a VD is back in the DisplayList
and reactivate its animator.
BUG:
30101451
Change-Id: Ib5eb54af954a58a2fa617643bfcf5af40ce708a5
TreeHugger Robot [Wed, 20 Jul 2016 20:30:09 +0000 (20:30 +0000)]
Merge "Snooze schedule rules that were canceled by alarms." into nyc-mr1-dev
Felipe Leme [Wed, 20 Jul 2016 19:19:19 +0000 (19:19 +0000)]
Merge \"Improved storage size detection.\" into nyc-mr1-dev
am:
f0de4da42f
Change-Id: I9794d1d3e15177c88e49911e1b406433025e85c4
Bryan Mawhinney [Wed, 20 Jul 2016 19:13:04 +0000 (19:13 +0000)]
Merge \"Add .mov to MediaScanner video file types\" into nyc-mr1-dev
am:
881bc352ee
Change-Id: I323e40003c87b2b892b1cb0712507cabc7b1d1d5
TreeHugger Robot [Wed, 20 Jul 2016 19:06:11 +0000 (19:06 +0000)]
Merge "Improved storage size detection." into nyc-mr1-dev
Adrian Roos [Fri, 15 Jul 2016 19:26:49 +0000 (12:26 -0700)]
Direct Reply: Fix circular reveal origin
Makes sure the circular reveal origin matches the bounds of the
text. This is necessairy because the TextView for the last action
spans the full remaining width and is usually much larger than the
text, which makes the reveal look uncentered.
Also adds an animation for closing the direct reply view.
Bug:
29876991
Change-Id: Ib0ae8a12423f0ecfc573928a39634404c8232e40
Bryan Mawhinney [Wed, 20 Jul 2016 18:58:29 +0000 (18:58 +0000)]
Merge "Add .mov to MediaScanner video file types" into nyc-mr1-dev
Julia Reynolds [Tue, 19 Jul 2016 14:18:32 +0000 (10:18 -0400)]
Snooze schedule rules that were canceled by alarms.
So a reboot or snoozed alarm doesn't cause them to
reactivate.
Bug:
30087850
Change-Id: I83fdb88009b515d442993944aec40df7365e830f
Michael Wright [Wed, 20 Jul 2016 18:41:58 +0000 (19:41 +0100)]
Merge commit '
f8bc27d9683e4089cdfd778dcb61ae67f44665b7' into manual_merge_f8bc27d
Christopher Ferris [Wed, 20 Jul 2016 18:26:41 +0000 (18:26 +0000)]
Merge \\\"Remove dependency on android_alarm.h.\\\" am:
c95e7a3014 am:
8f7223e420
am:
96d02a6c08
Change-Id: Ibb7cc1fa2c8ddeb3d0b7154f817d6c9738d079e4
Christopher Ferris [Wed, 20 Jul 2016 18:18:17 +0000 (18:18 +0000)]
Merge \\"Remove dependency on android_alarm.h.\\" am:
c95e7a3014
am:
8f7223e420
Change-Id: I7fd6c49a94b557772f3f2d9d2f751ef2fd42eee8
Christopher Ferris [Wed, 20 Jul 2016 18:10:47 +0000 (18:10 +0000)]
Merge \"Remove dependency on android_alarm.h.\"
am:
c95e7a3014
Change-Id: I19908fa29772c89b8112e371702da6197b20465d
Christopher Ferris [Wed, 20 Jul 2016 18:03:47 +0000 (18:03 +0000)]
Merge "Remove dependency on android_alarm.h."
Ye Wen [Mon, 18 Jul 2016 21:36:22 +0000 (14:36 -0700)]
Add carrier config for close connection after MMS request
b/
29558615
Change-Id: I24d922f33626b4a65c267dc2d132b5510e357c0f
TreeHugger Robot [Wed, 20 Jul 2016 17:21:33 +0000 (17:21 +0000)]
Merge "Rename color transform to color mode and persist the value." into nyc-mr1-dev
Phil Weaver [Wed, 20 Jul 2016 16:57:52 +0000 (16:57 +0000)]
Merge \"Suppress exceptions for corner-case a11y events.\" into nyc-mr1-dev
am:
39abe33b50
Change-Id: If169e5ab2a6241e6df720fa427a9eaee61d3cdc8
Phil Weaver [Wed, 20 Jul 2016 16:46:41 +0000 (16:46 +0000)]
Merge "Suppress exceptions for corner-case a11y events." into nyc-mr1-dev
Jason Monk [Wed, 20 Jul 2016 16:00:55 +0000 (16:00 +0000)]
Merge \"QS: Fix missing flashlight tile\" into nyc-mr1-dev
am:
761d89ef4e
Change-Id: I3761bee17e20d8c6039220766d195f2d5536c27a
Dianne Hackborn [Wed, 20 Jul 2016 15:53:17 +0000 (15:53 +0000)]
Merge \"Add reporting of long wake locks.\" into nyc-mr1-dev
am:
ca37695ebc
Change-Id: I98b06d561945fddef5be4b749b5b2128b8622add
Jason Monk [Wed, 20 Jul 2016 15:53:11 +0000 (15:53 +0000)]
Merge \"QS: Fix crash in tile API\" into nyc-mr1-dev
am:
77d8771b30
Change-Id: I6669e736208ada6ebd5bd2fc9e0466f924bffd6a
TreeHugger Robot [Wed, 20 Jul 2016 15:51:11 +0000 (15:51 +0000)]
Merge "QS: Fix missing flashlight tile" into nyc-mr1-dev
Dianne Hackborn [Wed, 20 Jul 2016 15:45:35 +0000 (15:45 +0000)]
Merge "Add reporting of long wake locks." into nyc-mr1-dev
TreeHugger Robot [Wed, 20 Jul 2016 15:44:18 +0000 (15:44 +0000)]
Merge "QS: Fix crash in tile API" into nyc-mr1-dev
Jason Monk [Wed, 20 Jul 2016 14:25:16 +0000 (10:25 -0400)]
QS: Fix missing flashlight tile
- Use PM Feature to determine if flashlight tile should be available
- Retry getting camera later when we don't have one
Change-Id: I997baa4ee103ac0165329b4c80f0459268e584e7
Fixes:
29911941
Jason Monk [Wed, 20 Jul 2016 14:18:09 +0000 (10:18 -0400)]
QS: Fix crash in tile API
Change-Id: I9062839ab59236c20e35645701254ea2d24cc876
Fixes:
30224352
Android Build Merger (Role) [Wed, 20 Jul 2016 03:30:45 +0000 (03:30 +0000)]
Merge "Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e am:
1e9889d5ac am:
a09b6ee165 am:
2331eefef7 am:
a20314a28e am:
a71fe00594 am:
9fd8d75ebc" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 20 Jul 2016 03:30:29 +0000 (03:30 +0000)]
Merge "Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994 am:
f8d4c187a3 am:
b3ff6b4437 am:
537535c14a am:
6b05e285cc am:
47e801972c am:
51bb81b46e" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 20 Jul 2016 03:30:14 +0000 (03:30 +0000)]
Merge "WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6 am:
d78a14531e am:
c77f18b2a3 am:
eef477c8b9 am:
cf3595400b -s ours am:
d77404a0e5 am:
15058ed5e2" into nyc-mr1-dev-plus-aosp
Paul Stewart [Wed, 20 Jul 2016 03:29:44 +0000 (03:29 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e am:
1e9889d5ac am:
a09b6ee165 am:
2331eefef7 am:
a20314a28e am:
a71fe00594
am:
9fd8d75ebc
Change-Id: I1131987821d39b09c63e58d2d8b8d9054ba18b4d
Paul Stewart [Wed, 20 Jul 2016 03:29:40 +0000 (03:29 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994 am:
f8d4c187a3 am:
b3ff6b4437 am:
537535c14a am:
6b05e285cc am:
47e801972c
am:
51bb81b46e
Change-Id: If9b2adc6ff344f48850681443b96040937ad8318
Paul Stewart [Wed, 20 Jul 2016 03:29:36 +0000 (03:29 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6 am:
d78a14531e am:
c77f18b2a3 am:
eef477c8b9 am:
cf3595400b -s ours am:
d77404a0e5
am:
15058ed5e2
Change-Id: I5d98afec8b64cdfab8c063b471231788549a610f
Paul Stewart [Wed, 20 Jul 2016 03:28:56 +0000 (03:28 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e am:
1e9889d5ac am:
a09b6ee165 am:
2331eefef7 am:
a20314a28e am:
a71fe00594
am:
a7aa029132
Change-Id: I8be18009c923720b0092fe9799c4b90475338083
Paul Stewart [Wed, 20 Jul 2016 03:28:54 +0000 (03:28 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994 am:
f8d4c187a3 am:
b3ff6b4437 am:
537535c14a am:
6b05e285cc am:
47e801972c
am:
756def010b
Change-Id: Iec2035be7a4484eee986e879185fff8cb3f5e7c5
Paul Stewart [Wed, 20 Jul 2016 03:28:51 +0000 (03:28 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6 am:
d78a14531e am:
c77f18b2a3 am:
eef477c8b9 am:
cf3595400b -s ours am:
d77404a0e5
am:
371aa0d792
Change-Id: I7d6ae5696dff58bfd6d737e885d03b73031c790a
Paul Stewart [Wed, 20 Jul 2016 03:23:13 +0000 (03:23 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e am:
1e9889d5ac am:
a09b6ee165 am:
2331eefef7 am:
a20314a28e
am:
a71fe00594
Change-Id: I93d600fe926037601f367697dd6f30f3ddca5e69
Paul Stewart [Wed, 20 Jul 2016 03:23:11 +0000 (03:23 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e am:
1e9889d5ac am:
a09b6ee165 am:
2331eefef7 am:
a20314a28e
am:
a71fe00594
Change-Id: I413208f7d9a86902f6159d115d90817ba3929a53
Paul Stewart [Wed, 20 Jul 2016 03:23:10 +0000 (03:23 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994 am:
f8d4c187a3 am:
b3ff6b4437 am:
537535c14a am:
6b05e285cc
am:
47e801972c
Change-Id: Ib1ffaf10f47884fe64660ad5266d0057affe920c
Paul Stewart [Wed, 20 Jul 2016 03:23:09 +0000 (03:23 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994 am:
f8d4c187a3 am:
b3ff6b4437 am:
537535c14a am:
6b05e285cc
am:
47e801972c
Change-Id: Iea3e559cc86c3ff89b0165ef4479a31c6e4980c4
Paul Stewart [Wed, 20 Jul 2016 03:23:07 +0000 (03:23 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6 am:
d78a14531e am:
c77f18b2a3 am:
eef477c8b9 am:
cf3595400b -s ours
am:
d77404a0e5
Change-Id: Ic99eff4cab95c24391b66f62e307dcb5cfbde823
Paul Stewart [Wed, 20 Jul 2016 03:23:05 +0000 (03:23 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6 am:
d78a14531e am:
c77f18b2a3 am:
eef477c8b9 am:
cf3595400b -s ours
am:
d77404a0e5
Change-Id: Ic7d1e557c9b1c0eb2d3cd18c1c7b8055638d1c3e
Paul Stewart [Wed, 20 Jul 2016 03:17:07 +0000 (03:17 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e am:
1e9889d5ac am:
a09b6ee165 am:
2331eefef7
am:
a20314a28e
Change-Id: I54f5b652c5c5bc148a8058cea665aab5327c61ab
Paul Stewart [Wed, 20 Jul 2016 03:17:01 +0000 (03:17 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994 am:
f8d4c187a3 am:
b3ff6b4437 am:
537535c14a
am:
6b05e285cc
Change-Id: I85e36294bd68be5da928d96dd7d9742f7fba53d3
Paul Stewart [Wed, 20 Jul 2016 03:16:50 +0000 (03:16 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6 am:
d78a14531e am:
c77f18b2a3 am:
eef477c8b9
am:
cf3595400b -s ours
Change-Id: I983c0d096671d522f3eed3eb3deacff300b50bb9
Android Build Merger (Role) [Wed, 20 Jul 2016 01:36:41 +0000 (01:36 +0000)]
Merge "Merge \\\\\\"docs: Updated descriptions of device orientation angles.\\\\\\" into mnc-docs am:
d312201b74 am:
6b4d2a2e6d am:
a812012c52 am:
b9487874fe am:
55b52a2b3f am:
b73cdcefcc" into nyc-mr1-dev-plus-aosp
Kevin Hufnagle [Wed, 20 Jul 2016 01:36:22 +0000 (01:36 +0000)]
Merge \\\\\\"docs: Updated descriptions of device orientation angles.\\\\\\" into mnc-docs am:
d312201b74 am:
6b4d2a2e6d am:
a812012c52 am:
b9487874fe am:
55b52a2b3f
am:
b73cdcefcc
Change-Id: If11f3825cc3677b2976e6a253aa77b6e86e218dd
Kevin Hufnagle [Wed, 20 Jul 2016 01:35:56 +0000 (01:35 +0000)]
Merge \\\\\\"docs: Updated descriptions of device orientation angles.\\\\\\" into mnc-docs am:
d312201b74 am:
6b4d2a2e6d am:
a812012c52 am:
b9487874fe am:
55b52a2b3f
am:
87a8e5eebd
Change-Id: I946cd3820608cd6f33f62abd397cda51138a17d2
Paul Stewart [Wed, 20 Jul 2016 01:35:14 +0000 (01:35 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e am:
1e9889d5ac am:
a09b6ee165
am:
2331eefef7
Change-Id: Ia0cccdca5f4e44ad4caf75240240eec73757e22b
Paul Stewart [Wed, 20 Jul 2016 01:35:10 +0000 (01:35 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994 am:
f8d4c187a3 am:
b3ff6b4437
am:
537535c14a
Change-Id: I0f9c27f32518f9c7bb1d3735741843178fc1dc02
Suprabh Shukla [Wed, 20 Jul 2016 00:32:15 +0000 (17:32 -0700)]
Setting a system property when device goes into demo mode
Need a system property so that init can listen to changes to
it and restrict the battery driver from charging the battery beyond
an optimal charge level when the device is in retail demo mode
Bug:
30230924
Change-Id: I277acf27a442ec8f37aac2b01a1a8e0164947a45
Kevin Hufnagle [Wed, 20 Jul 2016 01:29:00 +0000 (01:29 +0000)]
Merge \\\\\"docs: Updated descriptions of device orientation angles.\\\\\" into mnc-docs am:
d312201b74 am:
6b4d2a2e6d am:
a812012c52 am:
b9487874fe
am:
55b52a2b3f
Change-Id: Ib14b352efe5f10043b092e234a2b92f2c2aa2bc2
Kevin Hufnagle [Wed, 20 Jul 2016 01:28:59 +0000 (01:28 +0000)]
Merge \\\\\"docs: Updated descriptions of device orientation angles.\\\\\" into mnc-docs am:
d312201b74 am:
6b4d2a2e6d am:
a812012c52 am:
b9487874fe
am:
55b52a2b3f
Change-Id: I8c9a6fe4778a3344e8c6270f865567ba4bf05dbb
Paul Stewart [Wed, 20 Jul 2016 01:28:54 +0000 (01:28 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e am:
1e9889d5ac
am:
a09b6ee165
Change-Id: I63a60f729f95f273bf1918689626ac83771c73ac
Paul Stewart [Wed, 20 Jul 2016 01:28:52 +0000 (01:28 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994 am:
f8d4c187a3
am:
b3ff6b4437
Change-Id: I51e07e2ab6b3bee89dada0b6bf1ce1bf52f78d2f
Paul Stewart [Wed, 20 Jul 2016 01:28:32 +0000 (01:28 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6 am:
d78a14531e am:
c77f18b2a3
am:
eef477c8b9
Change-Id: I38649e47184a6b34a923037922fb6743f14fb6e1
Kevin Hufnagle [Wed, 20 Jul 2016 01:20:20 +0000 (01:20 +0000)]
Merge \\\\"docs: Updated descriptions of device orientation angles.\\\\" into mnc-docs am:
d312201b74 am:
6b4d2a2e6d am:
a812012c52
am:
b9487874fe
Change-Id: I034ce5c4a115fa4b694569c66a7e764543191cf7
Amith Yamasani [Tue, 19 Jul 2016 18:49:38 +0000 (11:49 -0700)]
Allow calling in demo mode
Allow outgoing calls, but clear the call log when
the next demo session starts so that the next
customer doesn't see any residue.
Fixes:
30220132
Change-Id: Ice71ba750f43fb31bf657d6ae31da62abbd72cfc
Paul Stewart [Wed, 20 Jul 2016 01:20:08 +0000 (01:20 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6 am:
d78a14531e
am:
c77f18b2a3
Change-Id: Id93c8ac53a78931c8fdba21b7c168e38a7ad7fe4
Paul Stewart [Wed, 20 Jul 2016 01:19:50 +0000 (01:19 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e
am:
1e9889d5ac
Change-Id: Ie0bfc4653bfe90335952110b38be2eeee418f98f
Paul Stewart [Wed, 20 Jul 2016 01:19:46 +0000 (01:19 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994
am:
f8d4c187a3
Change-Id: If6d30364da0246233415bc15a1dda7c297f7bf6b
Kevin Hufnagle [Wed, 20 Jul 2016 01:12:40 +0000 (01:12 +0000)]
Merge \\\"docs: Updated descriptions of device orientation angles.\\\" into mnc-docs am:
d312201b74 am:
6b4d2a2e6d
am:
a812012c52
Change-Id: Ifff8f0ca783a601dab3b4968a0e9708e34aa83f4