153791 Commits

Author SHA1 Message Date
Jorim Jaggi
5e08e6957d Fix blank Keyguard #4
When we were fading out the preview for phone/camera to crossfade to
the real application, it might have been that showKeyguard was
called in the middle of this transition. This change makes sure that
we cancel this animation when showing the keyguard.

Bug: 17439581
Change-Id: I89cacf7ecf43d37ea979418b976390272510a09d
2014-10-03 15:52:24 -07:00
Mike Lockwood
ebf9a0d8a8 Add support for playing audio during bootanimation
The bootanimation daemon will play 16 bit WAV files contained in bootanimation.zip
For this to work, the bootanimation.zip must contain an audio_conf.txt file,
which contains parameters to be used for the tinyalsa pcm_open call
as well as mixer parameters to set before attempting to play the sound.

If the bootanimation finds an audio_conf.txt file, then it will look for a file named
"audio.wav" in each of the part subdirectories. If audio.wav is found, it will play that
WAV file starting at the beginning of that part.

The code for this is based on the tinyplay utility in tinyalsa.

The audio_conf.txt and must begin with the following header:

card=<ALSA card number>
device=<ALSA device number>
period_size=<period size>
period_count=<period count>

This header is followed by zero or more mixer settings, each with the format:
mixer "<name>" = <value list>
Since mixer names can contain spaces, the name must be enclosed in double quotes.
The values in the value list can be integers, booleans (represented by 0 or 1)
or strings for enum values.

Finally I should mention that this change is not the right approach.
Instead of going straight to ALSA we should be using the mediaserver instead.
But mediaserver isn't ready in time due to interactions with the system server, and there
isn't time to fix this for the current release. We need to fix that for the next one.

Bug: 17674304

Change-Id: Ic391ade61c941d0a24f4d64fe005ac9375a23fa9
2014-10-03 15:38:15 -07:00
vandwalle
c520aa89a3 add millisecond timestamp to locallog
Change-Id: I33d8672efd2747ed3f49dd8d5bcd5f47bf418053
2014-10-03 15:35:25 -07:00
Jeff Sharkey
900e3b5fc5 Merge "More durable logging around system app upgrades." into lmp-dev 2014-10-03 22:35:19 +00:00
Jorim Jaggi
f009e3583f Merge "Fix blank lockscreen #3" into lmp-dev 2014-10-03 22:33:06 +00:00
John Reck
d988a45d60 Merge "Cleanup DeferredLayerUpdater" into lmp-dev 2014-10-03 22:22:52 +00:00
Jeff Sharkey
3933a5dc8c More durable logging around system app upgrades.
We've been seeing some really funky behavior when upgrading or
downgrading system apps around OTA time.  Put more of these one-time
logs into durable storage to help investigate.

Bug: 17805839
Change-Id: If898d7df229c1f71e598b0d965325c272060e5e7
2014-10-03 15:21:49 -07:00
Vinod Krishnan
4ff457e07e System dialog looked weird on LMP
Bug: 17785416, 17473800
Change-Id: I28dff1c0f3263571ef00786b2b6935f2dd216ddf
2014-10-03 15:15:19 -07:00
smain@google.com
8267ffccbe am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs
* commit 'cef9aab68ec45340186261d39ded6261ba1c5966':
  make sdk download links use HTTPS bug: 8033954
2014-10-03 22:13:14 +00:00
Rich Slogar
83d5c9bfbd docs:change required ADT version to 23.0.2
Change-Id: I6312cd45df94a89f2812aa3c53e2974f6cfbb0ed
2014-10-03 15:12:17 -07:00
Adam Lesinski
397001b2a7 am a80aba70: Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-dev
* commit 'a80aba70728c2843df94474dbd7829dadb77855f':
  AAPT: Gate v21 resource synthesizing logging behind -v flag
2014-10-03 22:10:48 +00:00
smain@google.com
cef9aab68e Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs 2014-10-03 22:06:44 +00:00
Adam Lesinski
a80aba7072 Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-dev 2014-10-03 22:06:03 +00:00
John Reck
749906b468 Cleanup DeferredLayerUpdater
Bug: 17765082

DeferredLayerUpdater had fallen behind RT updates. Re-snap to
latest expectations, ensuring to call requireGlContext() prior
to detachSurfaceTexture to avoid leaking SurfaceTextures

Change-Id: Ic65fb9831e5284f658866da8da9ad5af1d227699
2014-10-03 15:02:19 -07:00
Adam Lesinski
f15de2e215 AAPT: Gate v21 resource synthesizing logging behind -v flag
This is verbose information and should be hidden behind the -v flag.

Bug:17822471
Change-Id: I36e2c6beb54669a31cde73416427477a80ded8a6
2014-10-03 14:57:28 -07:00
Jorim Jaggi
449981be16 Fix blank lockscreen #3
Bug: 17439581
Change-Id: Ic8cb7f32200b541ecc8fa36ad2517975cec0b545
2014-10-03 14:24:55 -07:00
Quddus Chong
380dde32a7 docs: Modified the notice in the android.location package file to strongly
encourage developers to migrate to the Google Play Services Location API.

Change-Id: I9c2602daa7198eca38841582865c6a973f5acec8
2014-10-03 14:14:08 -07:00
Filip Gruszczynski
bc7f4f0e12 Log exception when creating Activity in ActivityUnitTestCase.
If the creation of an Activity fails, it is impossible to determine what
went wrong. We should log the exception immediately before failing on assert.

Change-Id: Ie6cbe87ff342b8d60989f5e1a6ffa3efc058c585
2014-10-03 14:06:19 -07:00
Svetoslav Ganov
31deb67dd0 am 76716c5a: Revert "TouchExplorer computes incorrectly the click location."
* commit '76716c5a180aa471c6973ca7aa03c7f2da677823':
  Revert "TouchExplorer computes incorrectly the click location."
2014-10-03 21:02:49 +00:00
Deepanshu Gupta
c62da8a0ba am c74a2b34: Merge "Minor style changes." into lmp-dev
* commit 'c74a2b343507546dd5b0a6be5afce42eb8b16a0d':
  Minor style changes.
2014-10-03 21:02:45 +00:00
Dianne Hackborn
02d758a9e8 am 7caa51e6: Merge "Fix issue #17811029: Settings provider race when removing users" into lmp-dev
* commit '7caa51e6ec6443d5c1fdb96f7e42508b074b4278':
  Fix issue #17811029: Settings provider race when removing users
2014-10-03 21:02:42 +00:00
RoboErik
2d553e95c9 am 7a60cdbd: Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev
* commit '7a60cdbd0989fdc262f7838b26c551a3417b7edb':
  Fix regression in RCC.editMetadata(false)
2014-10-03 21:02:38 +00:00
Christopher Tate
b5c55da5ab am b88ba912: Merge "Fix alarm delivery-order sorting" into lmp-dev
* commit 'b88ba912f6bb2fd0ae16794470cce38ee308b6ea':
  Fix alarm delivery-order sorting
2014-10-03 21:02:32 +00:00
Svetoslav Ganov
76716c5a18 Revert "TouchExplorer computes incorrectly the click location."
This reverts commit 851a5059a47cbf76e530c9d050a677cb6e3f8657 as
it creates a regression. Let us revert this and correctly fix the
issue the original change was trying to address.

bug:17789608

Change-Id: I8abb1a61d5310430e839e4ef60e7ca5cc0cbdd80
2014-10-03 20:37:10 +00:00
Deepanshu Gupta
c74a2b3435 Merge "Minor style changes." into lmp-dev 2014-10-03 20:30:45 +00:00
Dianne Hackborn
7caa51e6ec Merge "Fix issue #17811029: Settings provider race when removing users" into lmp-dev 2014-10-03 20:15:12 +00:00
RoboErik
7a60cdbd09 Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev 2014-10-03 20:13:28 +00:00
Christopher Tate
b88ba912f6 Merge "Fix alarm delivery-order sorting" into lmp-dev 2014-10-03 19:56:36 +00:00
RoboErik
51c07bc0bf Fix regression in RCC.editMetadata(false)
Found a very simple fix. Just set the cached metadata so we have
it to copy over when editMetadata(false) is called.

bug:17796693
Change-Id: Ib27f0c3d28e7f2a3c7d9495697f36c8045e2bcf6
2014-10-03 12:45:58 -07:00
Guang Zhu
35eb89097f am ba5df0d0: Merge "Prevent monkey from triggering bugreport" into lmp-dev
* commit 'ba5df0d01970ec97d64397d9db55f8d1ad98aa16':
  Prevent monkey from triggering bugreport
2014-10-03 19:44:27 +00:00
Guang Zhu
ba5df0d019 Merge "Prevent monkey from triggering bugreport" into lmp-dev 2014-10-03 19:38:37 +00:00
Christopher Tate
1590f1ee7b Fix alarm delivery-order sorting
We also refine the order of delivery within any given package.  Now,
we identify which apps have wakeup alarms being delivered in the
current pass, and deliver all of that app's alarms before moving
on to alarm delivery to apps who are only receiving non-wakeup alarms
in the current delivery pass.  The TIME_TICK alarm is also hoisted to
the start of the current delivery pass if present.

Bug 17778686

Change-Id: I6306a00fe657787a77d0254c0807ac51e810fdcf
2014-10-03 12:33:35 -07:00
Dianne Hackborn
67f175cf07 Fix issue #17811029: Settings provider race when removing users
Change-Id: Ia40d0a9c161b765d1340db5390d0acdbfc050b81
2014-10-03 12:29:43 -07:00
Guang Zhu
98a881418a Prevent monkey from triggering bugreport
Change-Id: Ifa6f06f7dfa63b740352ad7388f33911649afcb0
2014-10-03 12:23:43 -07:00
Dianne Hackborn
5ebb0e6a1e am d867b7c7: Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
* commit 'd867b7c7a2c8c151c01b57597b6612ca5355a51a':
  Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
2014-10-03 19:21:06 +00:00
Dianne Hackborn
d867b7c7a2 Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...
...'java.lang.String java.lang.String.substring(int)' on a null object reference

Change-Id: I4a78653174da398a4edd23b2bc099598548b79c2
2014-10-03 11:43:10 -07:00
Ricardo Cervera
677dd506e6 am 1e2e4307: am 1242af06: am 32cfe2bb: am d37afa37: Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs
* commit '1e2e4307ff381e5cb9d8d19eb6a1aca763ba9415':
  docs: Unbuntu troubleshooting link to CamelCase ID
2014-10-03 18:16:03 +00:00
Ricardo Cervera
1e2e4307ff am 1242af06: am 32cfe2bb: am d37afa37: Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs
* commit '1242af060bec63ec3a37512ebbbdbe545bd9f0f7':
  docs: Unbuntu troubleshooting link to CamelCase ID
2014-10-03 18:11:52 +00:00
Ricardo Cervera
1242af060b am 32cfe2bb: am d37afa37: Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs
* commit '32cfe2bbc71091a1ab282d5c7e4df7db5f6051e6':
  docs: Unbuntu troubleshooting link to CamelCase ID
2014-10-03 18:05:41 +00:00
Ricardo Cervera
32cfe2bbc7 am d37afa37: Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs
* commit 'd37afa37452d5e5dab3704ecab0ab7cebb3da292':
  docs: Unbuntu troubleshooting link to CamelCase ID
2014-10-03 18:00:37 +00:00
Raluca Sauciuc
0180dfeff3 Fix test framework to allow Mockito tests to run successfully on ART.
Currently, Mockito tests don't run on ART (KitKat & L) due to an extra
NoClassDefFoundError exception being thrown while trying to resolve
internal test runner classes. These exceptions are benign, Mockito's
internal test runners all inherit from org.junit.runner.Runner, which is
not included in the setup, but none of them are actually used in tests.

The same apks succeed on Dalvik, and logcat shows the same exceptions
 going by, minus the NCDFE's.

Section 5.3 of the VM spec says the virtual machine has to wrap a
ClassNotFoundException in NoClassDefFoundError if the first exception
arises from verification or resolution but not initialization of that
particular class.

Bug: 17042833
Change-Id: I3af20f6884d9fa3afc3fbf9fcb238be10267827a
2014-10-03 10:58:29 -07:00
Ricardo Cervera
d37afa3745 Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs 2014-10-03 17:55:36 +00:00
Paul Jensen
88eb0fa8ee Use network-specific HTTP proxy settings in captive portal login app.
The HTTP proxy system properties are set based on the proxy configured
for the network the captive portal login app is operating on.  These
system properties are subsequently read by the WebView used to perform
the sign-in.
This is a short-term fix using reflection.  This allows users with
cellular providers that use proxies to sign into WiFi captive portals.
The long-term fix could involve:
1. Sending out a network-specific proxy config changed broadcast, and
2. Modifying the ActivityThread to set proxy system properties for
   Networks selected with setProcessDefaultNetwork(), and
3. Modifying WebView to read from the proxy system properties when
   PROXY_CHANGE_ACTION broadcasts are received.

bug:17679789
Change-Id: I3ada0470ad085df1a4452b4a655ac35f310d2241
2014-10-03 13:21:12 -04:00
Ricardo Cervera
43c758b4ce docs: Unbuntu troubleshooting link to CamelCase ID
Change-Id: I705d17346c470563c350df9bb17d23f3fda5fbc5
2014-10-03 09:44:25 -07:00
Robert Greenwalt
3515ab8092 am 24861eab: Merge "Send callbacks for Net property changes" into lmp-dev
* commit '24861eabe641d5a147f127c8e7f98fab949224ab':
  Send callbacks for Net property changes
2014-10-03 15:41:04 +00:00
Robert Greenwalt
24861eabe6 Merge "Send callbacks for Net property changes" into lmp-dev 2014-10-03 15:36:39 +00:00
John Spurlock
7da91cc21f am a79caa53: Merge "Update framework icons for media & alarm streams." into lmp-dev
* commit 'a79caa53405ea3efdd77d59ea7aa6dd64ecf09d3':
  Update framework icons for media & alarm streams.
2014-10-03 14:00:29 +00:00
John Spurlock
a79caa5340 Merge "Update framework icons for media & alarm streams." into lmp-dev 2014-10-03 13:55:25 +00:00
John Spurlock
e1cddd34eb am a23867c4: Merge "Disable notification effects during phone calls." into lmp-dev
* commit 'a23867c4e8efb4cd9e86c70bff1a595da6679a82':
  Disable notification effects during phone calls.
2014-10-03 13:53:48 +00:00
John Spurlock
a23867c4e8 Merge "Disable notification effects during phone calls." into lmp-dev 2014-10-03 13:49:43 +00:00