1728 Commits

Author SHA1 Message Date
Mitchell Wills
fe11efd868 Merge commit 'accde60f09508f9543a094247ed95ce2ae605912' into nyc-mr1-dev-plus-aosp
Change-Id: I732a9b0bb6e569be342a6df3640f4e539f9ccce0
2016-08-29 20:38:08 -07:00
Mitchell Wills
e0d09999e9 DO NOT MERGE Revert "Add WiFi toggle prompts - framework"
This reverts commit 40f8b9251831c5f009fd476b1a3d216e126d3ef0.

Change-Id: I9a1d861277e5d32405da5815c8b4e5d616febf10
2016-08-29 20:21:42 -07:00
Mitchell Wills
722de5f9d0 DO NOT MERGE Manually merge commit 'f28778064383821ccf48c9570191f34a24aa513f' into nyc-mr1-dev-plus-aosp
Change-Id: I7cb1f97a5b931c2057a811d7947f47ad7320ef1c
2016-08-29 17:46:44 -07:00
Svetoslav Ganov
40f8b92518 Add WiFi toggle prompts - framework
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

bug:28715749

Change-Id: I020601e208c0736005bcabc7b7b77b96eee45b03
(cherry picked from commit d3663c04a721e0848dd3e9179c84ba585d91839d)
2016-08-29 11:26:51 -07:00
Dmitriy Filchenko
185aff8565 Merge "Remove unused includes." am: 35da832634 am: 33e65232f3
am: eb349448aa

Change-Id: Ib07d472af12852399a80d5a6503c1c34a6c9380c
2016-08-18 03:33:20 +00:00
Dmitriy Filchenko
33e65232f3 Merge "Remove unused includes."
am: 35da832634

Change-Id: I5804c0ccf6c543471ddf3245a799d5fa651d6d18
2016-08-18 03:22:39 +00:00
Dmitriy Filchenko
7310cc4880 Remove unused includes.
BUG: 29824203

Change-Id: I795f8abe31575f70da263921c6ec13b73b24dc7b
2016-08-18 01:45:11 +00:00
Geoffrey Pitsch
9e7b3f657f Suppress Boot sound for non-standard scenarios. am: 290c4350ed
am: 854f8cecf7

Change-Id: I182a77ce9fec2ae3f900a544ac4af8064240a06b
2016-08-11 13:13:04 +00:00
Geoffrey Pitsch
290c4350ed Suppress Boot sound for non-standard scenarios.
Blacklisted bootreasons will not play a sound (e.g. "kernel_panic")
If boot has already completed, assume this is a runtime restart and
skip the sound.

Bug: 30654343
Change-Id: I41b1829a93c0d9a63c69aea2d1614eaa18b72230
2016-08-10 10:52:48 -04:00
Geoffrey Pitsch
5e8bb86e8c BootAnimation system property to play sound. am: 305087991d
am: 8e4b8a988f

Change-Id: Icd062a5b3eb9da9d9c7bd3c5d7dd4e40f75c3a1e
2016-08-09 17:22:51 +00:00
Geoffrey Pitsch
305087991d BootAnimation system property to play sound.
Optional system property "persist.sys.bootanim.play_sound"
If nonexistent, default behavior plays the sound.

Bug: 30690353
Change-Id: Ie5ed456d891632be5ec8be255ac7c1193753c741
2016-08-08 16:18:21 -04:00
Dimitry Ivanov
96be90067d Merge "libsigchain: intercept bsd_signal on lp32" am: 6eb30f2060 am: 4e3a78a5ff
am: c58ea7d777

Change-Id: Ie2b5e51731c6daa24321a220eca0b7312ada6432
2016-08-01 23:10:54 +00:00
Dimitry Ivanov
4e3a78a5ff Merge "libsigchain: intercept bsd_signal on lp32"
am: 6eb30f2060

Change-Id: Iee2b7a8db495dd76bb6468a03e6cffd29a998cdf
2016-08-01 22:46:55 +00:00
Dimitry Ivanov
4c5281862f libsigchain: intercept bsd_signal on lp32
bsd_signal is a deprecated synonym for the signal. Nevertheless
there are apps and libraries calling this function.

libsigchain needs to intercept these calls and handle them the same
way it handles signal() call.

Bug: http://b/30562229
Test: readelf --dyn-sym app_process32 and check that bsd_signal is exported
      readelf --dyn-sym app_process64 and check that bsd_signal is not exported
Change-Id: Iec584070b42bc7fa43b114c0f884aff2db5a6858
2016-08-01 14:19:26 -07:00
Sai Kiran Korwar
af2a8a9ca6 Merge \\\"bootanimation: Call eglReleaseThread in threadLoop\\\" am: 189bbd9f6d am: 9495872add
am: 41ebe86049

Change-Id: I7927f23aa76cc17221e557d7f36b95bc23696a1b
2016-07-25 03:57:18 +00:00
Sai Kiran Korwar
9495872add Merge \"bootanimation: Call eglReleaseThread in threadLoop\"
am: 189bbd9f6d

Change-Id: Iaa5b3e60548ee2cce19cb4c31a6274d0ad877189
2016-07-25 03:46:44 +00:00
Jesse Hall
189bbd9f6d Merge "bootanimation: Call eglReleaseThread in threadLoop" 2016-07-25 03:36:57 +00:00
Eric Laurent
88e23db1ee bootanimation: fix glitchy playback
am: 197e47979a

Change-Id: Idbde31bfa48916f829bc3a1f934bd894c3303fcc
2016-07-22 20:33:34 +00:00
Eric Laurent
197e47979a bootanimation: fix glitchy playback
Do not use low latency playback mode to be more
robust against scheduling problems during boot phase.

Also:
- remove unused reverb on output mix
- fix WAV file parser.

Bug: 30277818
Change-Id: I1e15d3003a25c93d4995006885b32a754d17343f
2016-07-22 11:31:25 -07:00
Geoffrey Pitsch
bbb9d56a0e Merge \"Play boot sound on the System stream.\" into nyc-mr1-dev
am: 7d2f4cc750

Change-Id: I83cea2be8c0f4700eb9f1808b1e713e08b1f2ef3
2016-07-19 19:13:05 +00:00
Dmitriy Filchenko
a2170b076b Merge \\\"Handle long process names correctly.\\\" am: e2994438d2 am: d5a72fae4a
am: ea9616e48e

Change-Id: Ib14e7dbbba8f91de0491be9b91b5891ce8520c00
2016-07-19 00:39:17 +00:00
Dmitriy Filchenko
d5a72fae4a Merge \"Handle long process names correctly.\"
am: e2994438d2

Change-Id: I4edb617030ed2cedb394729f9ce94af080d3e358
2016-07-19 00:19:15 +00:00
Dmitriy Filchenko
f5b6e5590e Handle long process names correctly.
pthread_setname_np() expects 16 or fewer characters for the name argument. When the process name is longer, we should trim it.

Change-Id: I40be3a4212bdaab900c8eb30fa27aeeb7ed1b0d1
2016-07-18 16:03:05 -07:00
Geoffrey Pitsch
5613313533 Play boot sound on the System stream.
Turning down the ring volume will also turn down boot sound.

BUG:30132711
Change-Id: I902e56b20f105c27209dd47f054e98085647ee85
2016-07-15 10:50:04 -04:00
Geoffrey Pitsch
1e23c3d606 Merge \"Fixes delay when playing first sound in BootAnimation\" into nyc-mr1-dev
am: ebfa6df9a0

Change-Id: Id8b55b666ddd21f5ad767635ff68c2e82edfa2f8
2016-07-14 14:31:39 +00:00
Dmitriy Filchenko
9edf0fd00b Merge \\\"Remove calls to set_process_name.\\\" am: 8ee58b3b4e am: c1a1487057
am: a21bfb1160

Change-Id: I86f932c6ff09cda9b4161046b691e4ee45d80dd1
2016-07-13 20:10:01 +00:00
Dmitriy Filchenko
c1a1487057 Merge \"Remove calls to set_process_name.\"
am: 8ee58b3b4e

Change-Id: Ia0157f7b7fa1b048ca98b55f5525089046e6cccd
2016-07-13 19:57:52 +00:00
Geoffrey Pitsch
a91a2d7375 Fixes delay when playing first sound in BootAnimation
audioplay is initialized with an example of the type of clip it
will play.
Also remove asserts and debug compile settings from BootAnimation.

BUG:24800792
Change-Id: Icb78489417aee0549c340c746b25e57ccdb3427e
2016-07-13 15:51:24 -04:00
Damien Bargiacchi
c1c895b573 Merge \"Don\'t show times before 2000-01-01\" into nyc-mr1-dev
am: 4786f6d958

Change-Id: Ic0eb9edf0cc94f62d808e214e19c8003dc9a7941
2016-07-13 00:51:43 +00:00
Damien Bargiacchi
4786f6d958 Merge "Don't show times before 2000-01-01" into nyc-mr1-dev 2016-07-13 00:40:07 +00:00
Damien Bargiacchi
9676281c4f Don't show times before 2000-01-01
BUG=27802041

Change-Id: Iaa826e029c3b887e2bda6d12bc7c372d862ed320
2016-07-12 16:03:37 -07:00
Dmitriy Filchenko
342c7dcd02 Remove calls to set_process_name.
BUG:29824203

Change-Id: I67a1eb350cf9ea28c554166986df8fc251b666eb
2016-07-12 15:44:55 -07:00
Geoffrey Pitsch
dfd393a1e2 Merge \"OpenSL-based audio support for BootAnimation\" into nyc-mr1-dev
am: 859029ff7b

Change-Id: Idecb0041af13b9d263568c078bc0461ebb19e4ed
2016-07-12 17:37:30 +00:00
Geoffrey Pitsch
859029ff7b Merge "OpenSL-based audio support for BootAnimation" into nyc-mr1-dev 2016-07-12 17:29:56 +00:00
Tim Murray
6ab97e587e Merge changes from topic \'stune\' into nyc-mr1-dev
am: b646ec13e1

Change-Id: I9d21ab285810d4c218ff0854b98cf7fc0d555236
2016-07-11 20:37:19 +00:00
Tim Murray
b646ec13e1 Merge changes from topic 'stune' into nyc-mr1-dev
* changes:
  Put bootanimation in top-app stune group.
  Sets android.ui to be in the fg stune group.
2016-07-11 20:29:40 +00:00
Sai Kiran Korwar
d4d6e8e0aa Merge \"BootAnimation: Use npot textures\" into nyc-mr1-dev
am: 143d48927e

Change-Id: I112ce9bb6e33ba6c659f4be9a494321774e6e942
2016-07-11 20:20:31 +00:00
Geoffrey Pitsch
ffa690de95 Merge \"Wait until end of BootAnimation to free looping textures\" into nyc-mr1-dev
am: f1439105f8

Change-Id: I745d1c4608f6238dc170a6b5550013ffe50628dd
2016-07-11 20:20:26 +00:00
Geoffrey Pitsch
143d48927e Merge "BootAnimation: Use npot textures" into nyc-mr1-dev 2016-07-11 20:12:40 +00:00
Tim Murray
5c52691a48 Put bootanimation in top-app stune group.
bug 29512132

Change-Id: Id39650177b1f3b1ca24edb72b2809ee4ded396a1
2016-07-11 11:41:52 -07:00
Geoffrey Pitsch
2fb30fb68e Wait until end of BootAnimation to free looping textures
glDeleteTextures causes a noticeable framerate hitch when switching to
the outro.  By the time looping is finished, the system has finished
booting, so freeing the textures immediately is less beneficial.

Bug: 29878551
Bug: 30040263
Change-Id: I5a404a6e18cd2cf64d6c94343f82fa5db8dfbab3
2016-07-11 13:02:41 -04:00
Sai Kiran Korwar
271674930a BootAnimation: Use npot textures
If non power of two textures are supported, then use
npot texture for specifying the images supplied by vendor.
This will reduce the memory footprint of the app by a considerable
amount.

Bug: 28865582
Bug: 30040263
Change-Id: I5cef98fb013318d60d8a648041c9665da68c0ff3
2016-07-11 12:54:22 -04:00
Geoffrey Pitsch
d6d9a1d0b9 OpenSL-based audio support for BootAnimation
Respects dnd settings for sound playback.
Basic implementation uses in-memory wavs as buffers.
audioplay::playClip should not be called before previous clip ends.
Updated FORMAT.md to reflect no more audio_conf.txt

Bug: 29055299
Change-Id: Ifc358d7c85f11b8b54ae6446c40643b87bc567f2
2016-07-06 11:13:48 -04:00
Geoffrey Pitsch
c3b432acde Merge \"Support trimmed images in BootAnimation\" into nyc-mr1-dev
am: 656b9db5fb

Change-Id: Ida34d52d7761c1d08028121cffba12723caf8c00
2016-06-30 18:35:43 +00:00
Geoffrey Pitsch
656b9db5fb Merge "Support trimmed images in BootAnimation" into nyc-mr1-dev 2016-06-30 18:24:16 +00:00
Chong Zhang
0abc10769d Merge \"Fix off-by-one in am start -R (repeat)\" into nyc-mr1-dev
am: a3fc533d77

Change-Id: I1a779203012617991be1669b14d3466badc0cbd0
2016-06-29 16:58:15 +00:00
Geoffrey Pitsch
dd214a796f Support trimmed images in BootAnimation
Each frame directory may optionally contain a `trim.txt` to specify
how the image was trimmed relative to the animation's full size.
See FORMAT.md for more details.

Bug: 29055299
Change-Id: I7a291e9a52b4bbe50a29c519f6a4d0e2cc0389d7
2016-06-29 09:35:21 -04:00
Chong Zhang
2fde939272 Fix off-by-one in am start -R (repeat)
bug: 26028552
Change-Id: I075b378b6f126d124d867282d76a78d865b54178
2016-06-28 18:08:13 -07:00
Amith Yamasani
42daac6289 Merge \"Add tron logging for retail demo session counters\" into nyc-mr1-dev
am: 30a2b43f6d

Change-Id: Iaca49cc4aad9285e87d869b112b6c2986073f006
2016-06-28 01:06:47 +00:00
Amith Yamasani
b75fc2b2b7 Add tron logging for retail demo session counters
Count each demo user creation and time between
first touch (to dismiss the video) and the start
of inactivity timeout.

Fixed an NPE in SysUI when user switcher is missing.

Bug: 29540372
Change-Id: I7bc0e0dde75e7b213a025683c15c9b3e750643a9
2016-06-27 11:15:38 -07:00