Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pavel Zhamaitsiak
5ff25cb76c am 7635aab1: Merge "IMS: Peer capabilities support" into lmp-mr1-dev 
* commit '7635aab10b44773d599ef8229a967fdf99d2817a':
  IMS: Peer capabilities support
 2014-11-11 18:11:45 +00:00
Chris Wren
223c66b681 Add event logs when we launch fullscreen notications. 
When the heads up does not trigger on enqueue, and also when a heads up
is escalated to a fullscreen on a screen event.

Bug: 16644299
Change-Id: Iec7f7ddb966b46171d0e7d1ee52daf5847a7c9da
 2014-11-11 18:11:25 +00:00
Pavel Zhamaitsiak
7635aab10b Merge "IMS: Peer capabilities support" into lmp-mr1-dev 2014-11-11 18:07:06 +00:00
Wale Ogunwale
4937d95aa4 am 285970cf: Merge "Fixed index out of bounds issue when removing windows." into lmp-mr1-dev 
* commit '285970cfeae3b175699b038f51c0f9b012a95d0e':
  Fixed index out of bounds issue when removing windows.
 2014-11-11 18:03:04 +00:00
Wale Ogunwale
285970cfea Merge "Fixed index out of bounds issue when removing windows." into lmp-mr1-dev 2014-11-11 18:00:06 +00:00
Alan Viverette
0aaebd47cc am a9b503ae: Merge "Fix Material styling in remaining dialogs and layouts" into lmp-mr1-dev 
* commit 'a9b503aec2cd27eeb40fab8436c64b4c7de9cacf':
  Fix Material styling in remaining dialogs and layouts
 2014-11-11 17:39:55 +00:00
Alan Viverette
a9b503aec2 Merge "Fix Material styling in remaining dialogs and layouts" into lmp-mr1-dev 2014-11-11 17:34:36 +00:00
Deepanshu Gupta
8f6e7a868c am 7ed525bf: am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev 
* commit '7ed525bf92749113a177815ffce5d6545bd59314':
  Don't skip loading object animator.
 2014-11-11 17:26:17 +00:00
Deepanshu Gupta
7ed525bf92 am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev 
* commit '5ad9b395db341b3360d481039f152f8ce1d8360c':
  Don't skip loading object animator.
 2014-11-11 17:22:00 +00:00
Deepanshu Gupta
5ad9b395db am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev 
* commit 'a44fdb9e216810ba62f20c1b4571ebc240931efa':
  Don't skip loading object animator.
 2014-11-11 17:17:02 +00:00
Deepanshu Gupta
a44fdb9e21 Merge "Don't skip loading object animator." into lmp-dev 2014-11-11 17:11:24 +00:00
John Spurlock
3069aa2057 am 73546e53: Merge "Zen: Exit downtime on next alarm (if mode=none)." into lmp-mr1-dev 
* commit '73546e535925e6c2902cba10d9da962ba6b39d5f':
  Zen: Exit downtime on next alarm (if mode=none).
 2014-11-11 16:56:37 +00:00
George Mount
691487d2c3 Remove unnecessary reflection lookup in Animators. 
Bug 17978210

When Properties are used with PropertyValuesHolders or
ObjectAnimators, the reflection lookup for getters and
setters is unnecessary.

Fixed problem in which static maps were being protected
by instance locks.

Fixed problem where we were repeatedly doing a
reflection lookup on methods that don't exist.

Change-Id: Ic0a1b62357f3aaaa4c900fef6087583ad0e964b6
 2014-11-11 08:51:53 -08:00
John Spurlock
73546e5359 Merge "Zen: Exit downtime on next alarm (if mode=none)." into lmp-mr1-dev 2014-11-11 16:50:15 +00:00
Shriram Ganesh
482e6da972 IMS: Peer capabilities support 
Add support for querying peer capabilities

IMS: Add support for HD icon display related information

Added support to pass the restrict cause associated with the peer
in order to enable display of the HD icon when necessary.Added
support to pass local audio codec information and defined values
for new codecs not defined.

Change-Id: If05d46bdb3907a0ec7efdde48337a7932a7a5c21
 2014-11-11 16:36:15 +00:00
Selim Cinek
7d5f374dda Improved the dismiss all animation 
Added an AVD to the icon and changed the order
to be from bottom to the top.

Bug: 17903685
Bug: 17007783
Change-Id: Ia1509e2d4e02c87782285e05b7b7fb6a11854f95
 2014-11-11 17:10:38 +01:00
George Mount
ed22607780 am 341df464: am c07b6295: am 12403b24: Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev 
* commit '341df46488576899773cdfd438033fccc077ed83':
  Make setOutlineProvider change transitionGroup.
 2014-11-11 15:53:05 +00:00
George Mount
341df46488 am c07b6295: am 12403b24: Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev 
* commit 'c07b6295c6fefe845ae15e2adad7aebb2280b1ab':
  Make setOutlineProvider change transitionGroup.
 2014-11-11 15:48:52 +00:00
George Mount
c07b6295c6 am 12403b24: Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev 
* commit '12403b242f86c0572a99a963fd1e71eda680192b':
  Make setOutlineProvider change transitionGroup.
 2014-11-11 15:45:09 +00:00
George Mount
12403b242f Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev 2014-11-11 15:41:33 +00:00
Deepanshu Gupta
2c5cddbd07 Don't skip loading object animator. 
This is used by Buttons as part of StateListAnimator.

Change-Id: Id370869e71898d46e11bbd17ad31169c9f9f5274
 2014-11-11 15:21:19 +00:00
John Spurlock
3c984d67eb Zen: Exit downtime on next alarm (if mode=none). 
Bug: 16373455
Change-Id: Ie5d878ea4f930556ed84225c21d7c6df61024fbc
 2014-11-11 10:03:24 -05:00
Martin Wallgren
d865900425 Prevent resource leak in YuvToJpegEncoder 
SkWStream is never deleted before going out of scope

Change-Id: Ifdb75c18336d095b012e73b64281ec6c2fc5c3fe
 2014-11-11 12:37:29 +01:00
Johan Redestig
575bb3815a Consider RTL layout in DPAD navigation in AbsSeekBar 
Changes the behavior of onKeyDown for DPAD_LEFT/RIGHT when in RTL
to move the progress in same direction as the DPAD key suggest.

Change-Id: I776a48711571884a10ef9315de78bf4ebffd6e4b
 2014-11-11 12:35:56 +01:00
Florian Salbrechter
940e97f802 Merge "Fixed missing opening quotes for href in javadoc." 2014-11-11 11:25:39 +00:00
Narayan Kamath
76a748e62f Tell installd when boot completes. 
installd can then clear the ".booting" marker from the dalvik-cache
(owned by root). This marker is used to detect boot loops.

bug: 18280671

Change-Id: I878f1463c7f523892605c17b980a51ac3b6645e2
 2014-11-11 10:50:46 +00:00
Diego Perez
4985297bd7 Merge "Add new parameter to the render method to allow forcing a measure pass." 2014-11-11 09:51:02 +00:00
Wen Jing
cb3ab221f7 Skip receiver if failed linkToDeath to ILocationListener 
linkToDeath may failed when app was dead immediately after
starting the call to requestLocationUpdates in Location
service. If receiver still record in maps, an exception
will occurred when try to remove receiver's update because
unlinkToDeath will failed.

Change-Id: Id9b00da3b17c1371d61ab4644a70cf9ee934cdcc
 2014-11-11 10:13:49 +01:00
Andreas Gampe
2377cd319f Frameworks/base: Right transform in DngCreator 
Use the right calibrationTransform.

Change-Id: Ibc633ff1e02d1e48a27ae2a72585d3de2222a2c1
 2014-11-11 00:23:02 -08:00
Andreas Gampe
7c8201b61f Frameworks/base: Fix FingerprintManager JNI 
Register the right method.

Change-Id: I0806c2fa8f29ddef75caaf94092f72e644ae6d06
 2014-11-11 00:18:55 -08:00
Andreas Gampe
328126190b Frameworks/base: Fix AssetManager JNI 
Register the right method.

Change-Id: Ib5f5c531b4c5863eed04fe3b13f8c2662055fa5e
 2014-11-11 00:16:00 -08:00
Tim Kilbourn
30b1da9bcc am 06acead5: am 215779b2: am 54a5ca1a: Merge "Add tv product variants to strings." into lmp-mr1-dev 
* commit '06acead5a2207ef4d1e60ec4c8ea9b00515f79e0':
  Add tv product variants to strings.
 2014-11-11 06:46:38 +00:00
Tim Kilbourn
06acead5a2 am 215779b2: am 54a5ca1a: Merge "Add tv product variants to strings." into lmp-mr1-dev 
* commit '215779b2262a6fd0ebeb93a369ad148223984f30':
  Add tv product variants to strings.
 2014-11-11 06:42:51 +00:00
Tim Kilbourn
215779b226 am 54a5ca1a: Merge "Add tv product variants to strings." into lmp-mr1-dev 
* commit '54a5ca1aad1bdbb154ca731ab9a6c026d58a42d6':
  Add tv product variants to strings.
 2014-11-11 06:37:52 +00:00
Tim Kilbourn
54a5ca1aad Merge "Add tv product variants to strings." into lmp-mr1-dev 2014-11-11 06:32:33 +00:00
Andreas Gampe
edaecc1db0 resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp 
(cherry picked from commit 1272887050)

Change-Id: Ib673768fe5fc03615626ef4b10590e5317f22172
 2014-11-10 21:29:52 -08:00
Andreas Gampe
05ff23fdad am 8c48c68c: am 71f83672: Merge "Frameworks/base: Mask Skia warning in GraphicsJNI" 
* commit '8c48c68cc7801451d069819c4417a3a240a64294':
  Frameworks/base: Mask Skia warning in GraphicsJNI
 2014-11-11 05:26:42 +00:00
Andreas Gampe
9bd7896ef8 am 6ca82929: am c6e992a1: Merge "Frameworks/base: Wall Werror in libs/input" 
* commit '6ca82929b1253f95f08612f737baeee35a3849bd':
  Frameworks/base: Wall Werror in libs/input
 2014-11-11 05:26:31 +00:00
Andreas Gampe
f1c060b77b am 12728870: (-s ours) resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp 
* commit '1272887050a269d6d506b42099c2857847ad100b':
  Frameworks/base: Wall Werror in libs/hwui
 2014-11-11 05:26:27 +00:00
Andreas Gampe
8c48c68cc7 am 71f83672: Merge "Frameworks/base: Mask Skia warning in GraphicsJNI" 
* commit '71f83672f297b116988defbe989869e5744cda5e':
  Frameworks/base: Mask Skia warning in GraphicsJNI
 2014-11-11 05:10:19 +00:00
Andreas Gampe
71f83672f2 Merge "Frameworks/base: Mask Skia warning in GraphicsJNI" 2014-11-11 05:02:32 +00:00
Andreas Gampe
ba823cee8b Frameworks/base: Mask Skia warning in GraphicsJNI 
Do not allow unused-parameter warnings from Skia includes.

Change-Id: Icc765cb0eaf10cd566a64892fbfe7380143ccb42
 2014-11-10 21:01:06 -08:00
Andreas Gampe
6ca82929b1 am c6e992a1: Merge "Frameworks/base: Wall Werror in libs/input" 
* commit 'c6e992a1bc1bc02be9770ad2c384b6b7e5a0db0b':
  Frameworks/base: Wall Werror in libs/input
 2014-11-11 04:56:54 +00:00
Andreas Gampe
1272887050 resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp 
Change-Id: Ib673768fe5fc03615626ef4b10590e5317f22172
 2014-11-10 20:54:07 -08:00
Andreas Gampe
67333928bf Frameworks/base: Wall Werror in rs 
Turn on -Wall -Werror in rs/. Fix warnings.

Change-Id: I41923e4578edf26dbf6a31a83b6999e80d6d385a
 2014-11-10 20:35:59 -08:00
Andreas Gampe
baa73b056c am cba06c22: resolved conflicts for merge of 6957369d to lmp-mr1-dev-plus-aosp 
* commit 'cba06c2272c8bce7d10b2a7ee762d12043f3252a':
  Frameworks/base: Wall Werror in media/jni
 2014-11-11 04:02:22 +00:00
Andreas Gampe
cba06c2272 resolved conflicts for merge of 6957369d to lmp-mr1-dev-plus-aosp 
Change-Id: Ie3bd0e24c69c0c7ae500b8eb4a1198650e993a19
 2014-11-10 19:41:52 -08:00
Lorenzo Colitti
7f6c0d7d2d Populate 464xlat LinkProperties only when the interface comes up. 
Currently Nat464Xlat reads the clat IPv4 address and updates the
clat LinkProperties when the interface is created. This causes a
race condition: because clatd only sets the IPv4 address after
creating the interface, it's possible that Nat464Xlat will read
the address before clatd has set it, causing the framework to
think that the clat IPv4 address is 0.0.0.0/32.

This seems to be happening more frequently now, perhaps because
clatd takes a bit longer to configure the IPv4 address now that
it needs to check that the address is free before using it.

Fix this by making Nat464Xlat listen for the interface coming up
instead of listening for the interface being added.

Bug: 12111730
Change-Id: Ic1c59b5b6dbb851b7431d1b06885f67803373bb9
 2014-11-10 19:33:13 -08:00
Chong Zhang
8976a0954c return error MEDIA_ERROR_UNSUPPORTED when Range request fail 
Bug: 18235751
Change-Id: I4631daf50bb76b70dd740c45b628294ad1aa45e1
 2014-11-10 19:32:28 -08:00
Adam Lesinski
cbaa1c617b am 6ba4c9d9: am c78b33d0: Merge "split-select: fix OSX build" into lmp-mr1-dev automerge: be593a7 
* commit '6ba4c9d91bfcd2acf3ad85db0a7945438ab4548c':
  split-select: fix OSX build
 2014-11-11 03:01:46 +00:00