git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

Santos Cordon [Tue, 12 May 2015 20:47:25 +0000 (20:47 +0000)]

am 491b1c25: am a6b75013: am 3aea94ff: Merge "Rename Connection time APIs for Conference.java" into mnc-dev

* commit '491b1c254db2de764e1c6f29b18f8241e17fe948':
Rename Connection time APIs for Conference.java

commit | commitdiff | tree

Jeff Sharkey [Tue, 12 May 2015 20:47:20 +0000 (20:47 +0000)]

am 06cda101: am 5caab604: am bf6fbb00: Merge "Ignore abandon after install relinquished." into mnc-dev

* commit '06cda101112d7f5a6fb1adbcd9b1c56dcae77a58':
Ignore abandon after install relinquished.

commit | commitdiff | tree

Dianne Hackborn [Tue, 12 May 2015 20:47:16 +0000 (20:47 +0000)]

am d02b248c: am 34dde19f: am f931e3c2: Merge "Always use REGISTERED_ONLY when appropriate." into mnc-dev

* commit 'd02b248cf69457dceb0e5e411f567afc81edf47e':
Always use REGISTERED_ONLY when appropriate.

commit | commitdiff | tree

Santos Cordon [Tue, 12 May 2015 20:47:11 +0000 (20:47 +0000)]

am ba3f1b08: am 31f713ba: am 2d9a9c2a: Merge "Add RemoteConference javadocs." into mnc-dev

* commit 'ba3f1b08165e6910bb50156d75107655793a0aad':
Add RemoteConference javadocs.

commit | commitdiff | tree

Chien-Yu Chen [Tue, 12 May 2015 20:47:06 +0000 (20:47 +0000)]

am c7bc613f: am 58e591f6: am 4f6615a3: Merge "Camera2: stream configs for reprocessible session" into mnc-dev

* commit 'c7bc613fbeade78d392b0601044595b5cbc63db8':
Camera2: stream configs for reprocessible session

commit | commitdiff | tree

Santos Cordon [Tue, 12 May 2015 20:44:22 +0000 (20:44 +0000)]

am a6b75013: am 3aea94ff: Merge "Rename Connection time APIs for Conference.java" into mnc-dev

* commit 'a6b75013d4af6ec59c30f792e14ddc2986ff0b89':
Rename Connection time APIs for Conference.java

commit | commitdiff | tree

Jeff Sharkey [Tue, 12 May 2015 20:44:17 +0000 (20:44 +0000)]

am 5caab604: am bf6fbb00: Merge "Ignore abandon after install relinquished." into mnc-dev

* commit '5caab6044ce18891669a9c6c29c0838cd18b325c':
Ignore abandon after install relinquished.

commit | commitdiff | tree

Dianne Hackborn [Tue, 12 May 2015 20:44:12 +0000 (20:44 +0000)]

am 34dde19f: am f931e3c2: Merge "Always use REGISTERED_ONLY when appropriate." into mnc-dev

* commit '34dde19fa708278ca290f2266944aef67a8a946f':
Always use REGISTERED_ONLY when appropriate.

commit | commitdiff | tree

Santos Cordon [Tue, 12 May 2015 20:34:59 +0000 (20:34 +0000)]

am 31f713ba: am 2d9a9c2a: Merge "Add RemoteConference javadocs." into mnc-dev

* commit '31f713ba438a70163e2c1022e9ab3e05619a687b':
Add RemoteConference javadocs.

commit | commitdiff | tree

Chien-Yu Chen [Tue, 12 May 2015 20:34:54 +0000 (20:34 +0000)]

am 58e591f6: am 4f6615a3: Merge "Camera2: stream configs for reprocessible session" into mnc-dev

* commit '58e591f6c1c79ef9d9d3808f6acb2e2e409342e0':
Camera2: stream configs for reprocessible session

commit | commitdiff | tree

Wale Ogunwale [Tue, 12 May 2015 20:30:54 +0000 (20:30 +0000)]

am 381d909b: am 32c58de2: am f99bde92: Merge "Determine if TaskRecord is privilaged from creating ActivityInfo." into mnc-dev

* commit '381d909b84dce00178bcca60e369bfed66c174d6':
Determine if TaskRecord is privilaged from creating ActivityInfo.

commit | commitdiff | tree

John Spurlock [Tue, 12 May 2015 20:30:49 +0000 (20:30 +0000)]

am 0f138090: am 894cff7c: am e12931f6: Merge "DNDTile: Notify of value changes." into mnc-dev

* commit '0f138090c18d320e1eb9ad8ee27398a2941cd4f1':
DNDTile: Notify of value changes.

commit | commitdiff | tree

Alex Klyubin [Tue, 12 May 2015 20:30:43 +0000 (20:30 +0000)]

am e8a6a9fc: am e39a2190: am c5a142f8: Merge "Flatten KeyStoreKeyProperties constants." into mnc-dev

* commit 'e8a6a9fc402798b7e800cdfef67dd4d0295c13e2':
Flatten KeyStoreKeyProperties constants.

commit | commitdiff | tree

John Spurlock [Tue, 12 May 2015 20:30:39 +0000 (20:30 +0000)]

am 57243ff8: am 571a7cef: am e66ba473: Merge "Zen: Ringer mode integration fixes." into mnc-dev

* commit '57243ff8cc910f2a33e0af7f4b677896f25f3144':
Zen: Ringer mode integration fixes.

commit | commitdiff | tree

Santos Cordon [Tue, 12 May 2015 20:30:20 +0000 (20:30 +0000)]

am 3aea94ff: Merge "Rename Connection time APIs for Conference.java" into mnc-dev

* commit '3aea94ff56a409cae7698832a7fe54c1bcb708d5':
Rename Connection time APIs for Conference.java

commit | commitdiff | tree

Jeff Sharkey [Tue, 12 May 2015 20:30:15 +0000 (20:30 +0000)]

am bf6fbb00: Merge "Ignore abandon after install relinquished." into mnc-dev

* commit 'bf6fbb0040a9b37158d50102560ab57b98cae9ad':
Ignore abandon after install relinquished.

commit | commitdiff | tree

Dianne Hackborn [Tue, 12 May 2015 20:30:10 +0000 (20:30 +0000)]

am f931e3c2: Merge "Always use REGISTERED_ONLY when appropriate." into mnc-dev

* commit 'f931e3c28422a9169e01b2be62ac17c5159a70d0':
Always use REGISTERED_ONLY when appropriate.

commit | commitdiff | tree

Santos Cordon [Tue, 12 May 2015 20:25:58 +0000 (20:25 +0000)]

Merge "Rename Connection time APIs for Conference.java" into mnc-dev

commit | commitdiff | tree

Jeff Sharkey [Tue, 12 May 2015 20:22:37 +0000 (20:22 +0000)]

Merge "Ignore abandon after install relinquished." into mnc-dev

commit | commitdiff | tree

Wale Ogunwale [Tue, 12 May 2015 20:21:24 +0000 (20:21 +0000)]

am 32c58de2: am f99bde92: Merge "Determine if TaskRecord is privilaged from creating ActivityInfo." into mnc-dev

* commit '32c58de2759dd22e1e008896352a77a2fc9c716e':
Determine if TaskRecord is privilaged from creating ActivityInfo.

commit | commitdiff | tree

John Spurlock [Tue, 12 May 2015 20:21:19 +0000 (20:21 +0000)]

am 894cff7c: am e12931f6: Merge "DNDTile: Notify of value changes." into mnc-dev

* commit '894cff7cc26904b8f874352c4d623e46b4b4682d':
DNDTile: Notify of value changes.

commit | commitdiff | tree

Jeff Sharkey [Tue, 12 May 2015 20:07:14 +0000 (13:07 -0700)]

Ignore abandon after install relinquished.

We recently changed the install flow to fully dexopt before renaming
the staging directory. This exposed the ability for the session owner
to abandon and destroy the stage contents while dexopt was still
happening.

Due to SELinux rules, the abandon would fail to clean up the stage
directory, and PackageManager would "successfully" rename and install
that stage, which now only contained the oat/ directory.

To avoid this case, we now ignore abandon requests once we've passed
the "point of no return" and relinquished our stage over to
PackageManagerService.

Bug: 20175072
Change-Id: I4ad5b1eba0e38f1315b8330bd95be6e3bc6c635a

commit | commitdiff | tree

Alex Klyubin [Tue, 12 May 2015 20:21:13 +0000 (20:21 +0000)]

am e39a2190: am c5a142f8: Merge "Flatten KeyStoreKeyProperties constants." into mnc-dev

* commit 'e39a21908261d4e3c6d71a9525f453444f6cc76a':
Flatten KeyStoreKeyProperties constants.

commit | commitdiff | tree

John Spurlock [Tue, 12 May 2015 20:21:07 +0000 (20:21 +0000)]

am 571a7cef: am e66ba473: Merge "Zen: Ringer mode integration fixes." into mnc-dev

* commit '571a7cef900cc897150a86702132cf85e6047ab7':
Zen: Ringer mode integration fixes.

commit | commitdiff | tree

Santos Cordon [Tue, 12 May 2015 20:17:48 +0000 (20:17 +0000)]

am 2d9a9c2a: Merge "Add RemoteConference javadocs." into mnc-dev

* commit '2d9a9c2ad98f566494071c4d38bed5c6ee6bf383':
Add RemoteConference javadocs.

commit | commitdiff | tree

Chien-Yu Chen [Tue, 12 May 2015 20:17:44 +0000 (20:17 +0000)]

am 4f6615a3: Merge "Camera2: stream configs for reprocessible session" into mnc-dev

* commit '4f6615a30c6c1ec73a62621babe0a87277639242':
Camera2: stream configs for reprocessible session

commit | commitdiff | tree

Dianne Hackborn [Tue, 12 May 2015 20:17:18 +0000 (20:17 +0000)]

Merge "Always use REGISTERED_ONLY when appropriate." into mnc-dev

commit | commitdiff | tree

Chris Craik [Tue, 12 May 2015 20:11:48 +0000 (20:11 +0000)]

am e9724679: am ca0790cd: am 6af2857a: Merge "Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""" into mnc-dev

* commit 'e9724679302ddb0d83fa24d782601db7de30c050':
Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""

commit | commitdiff | tree

Santos Cordon [Tue, 12 May 2015 20:10:52 +0000 (20:10 +0000)]

Merge "Add RemoteConference javadocs." into mnc-dev

commit | commitdiff | tree

Wale Ogunwale [Tue, 12 May 2015 20:09:44 +0000 (20:09 +0000)]

am f99bde92: Merge "Determine if TaskRecord is privilaged from creating ActivityInfo." into mnc-dev

* commit 'f99bde92c242aa4fa57bba95013c6fff7af1fca1':
Determine if TaskRecord is privilaged from creating ActivityInfo.

commit | commitdiff | tree

John Spurlock [Tue, 12 May 2015 20:09:40 +0000 (20:09 +0000)]

am e12931f6: Merge "DNDTile: Notify of value changes." into mnc-dev

* commit 'e12931f6a5daf0f740f249aec8c3bab948b367f0':
DNDTile: Notify of value changes.

commit | commitdiff | tree

Alex Klyubin [Tue, 12 May 2015 20:09:36 +0000 (20:09 +0000)]

am c5a142f8: Merge "Flatten KeyStoreKeyProperties constants." into mnc-dev

* commit 'c5a142f82b85aef4d740af4e8fefedf1cd0333fe':
Flatten KeyStoreKeyProperties constants.

commit | commitdiff | tree

John Spurlock [Tue, 12 May 2015 20:09:32 +0000 (20:09 +0000)]

am e66ba473: Merge "Zen: Ringer mode integration fixes." into mnc-dev

* commit 'e66ba4736667afb9ff3b1d3ebc487d024531f2a3':
Zen: Ringer mode integration fixes.

commit | commitdiff | tree

Chien-Yu Chen [Tue, 12 May 2015 20:09:14 +0000 (20:09 +0000)]

Merge "Camera2: stream configs for reprocessible session" into mnc-dev

commit | commitdiff | tree

Wale Ogunwale [Tue, 12 May 2015 20:03:55 +0000 (20:03 +0000)]

Merge "Determine if TaskRecord is privilaged from creating ActivityInfo." into mnc-dev

commit | commitdiff | tree

Chris Craik [Tue, 12 May 2015 20:01:03 +0000 (20:01 +0000)]

am ca0790cd: am 6af2857a: Merge "Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""" into mnc-dev

* commit 'ca0790cdcdd95028f3e34c72a64b14658250fe7f':
Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""

commit | commitdiff | tree

Yohei Yukawa [Tue, 12 May 2015 20:00:50 +0000 (20:00 +0000)]

am e467e764: am c1f055a8: am f038295e: Merge "Remove obsolete fields from InputMethodManager." into mnc-dev

* commit 'e467e764bc3abba352b117397454df3082068dc3':
Remove obsolete fields from InputMethodManager.

commit | commitdiff | tree

John Spurlock [Tue, 12 May 2015 19:58:48 +0000 (19:58 +0000)]

Merge "DNDTile: Notify of value changes." into mnc-dev

commit | commitdiff | tree

Santos Cordon [Tue, 12 May 2015 19:09:47 +0000 (12:09 -0700)]

Add RemoteConference javadocs.

Bug: 21066411
Change-Id: Ie4cdfef58e6442531c3377cec4a708d67b790945

commit | commitdiff | tree

Alex Klyubin [Tue, 12 May 2015 19:57:09 +0000 (19:57 +0000)]

Merge "Flatten KeyStoreKeyProperties constants." into mnc-dev

commit | commitdiff | tree

John Spurlock [Tue, 12 May 2015 19:54:47 +0000 (19:54 +0000)]

Merge "Zen: Ringer mode integration fixes." into mnc-dev

commit | commitdiff | tree

Alex Klyubin [Tue, 12 May 2015 19:53:23 +0000 (12:53 -0700)]

Flatten KeyStoreKeyProperties constants.

This moves constants/flags declared in inner classes of
KeyStoreKeyProperties into KeyStoreKeyProperties, as requested by API
Council.

Bug: 21039983
Change-Id: I84a3c983e13644a027bed9f605ab8044220a352c

commit | commitdiff | tree

John Spurlock [Tue, 12 May 2015 19:52:38 +0000 (15:52 -0400)]

DNDTile: Notify of value changes.

Bug: 21055789
Change-Id: If9008b13a6a5583832fc4dfaa8ec3e21b61cb25c

commit | commitdiff | tree

Chris Craik [Tue, 12 May 2015 19:48:17 +0000 (19:48 +0000)]

am 6af2857a: Merge "Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""" into mnc-dev

* commit '6af2857ae0c3bde47e0e4a6abd84f42ee7086291':
Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""

commit | commitdiff | tree

Santos Cordon [Tue, 12 May 2015 19:32:51 +0000 (12:32 -0700)]

Rename Connection time APIs for Conference.java

Bug: 21072487
Change-Id: I7bed9957770639f2adf3c7bd31a4821c0ff0f0dd

commit | commitdiff | tree

Chris Craik [Tue, 12 May 2015 19:40:25 +0000 (19:40 +0000)]

Merge "Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""" into mnc-dev

commit | commitdiff | tree

Yohei Yukawa [Tue, 12 May 2015 19:36:44 +0000 (19:36 +0000)]

am c1f055a8: am f038295e: Merge "Remove obsolete fields from InputMethodManager." into mnc-dev

* commit 'c1f055a809c27f2e512029dc5623c4405eddb9b3':
Remove obsolete fields from InputMethodManager.

commit | commitdiff | tree

Yohei Yukawa [Tue, 12 May 2015 19:27:59 +0000 (19:27 +0000)]

am f038295e: Merge "Remove obsolete fields from InputMethodManager." into mnc-dev

* commit 'f038295e98846e3e359854b1642b362643bd6053':
Remove obsolete fields from InputMethodManager.

commit | commitdiff | tree

Dan Sandler [Tue, 12 May 2015 19:23:49 +0000 (19:23 +0000)]

am efeac7b6: am 81246cec: am dbd90f03: Merge "Tests for Notification object construction and parceling." into mnc-dev

* commit 'efeac7b6f1722667a890ae72564b976fadf42c89':
Tests for Notification object construction and parceling.

commit | commitdiff | tree

Yohei Yukawa [Tue, 12 May 2015 19:16:30 +0000 (19:16 +0000)]

Merge "Remove obsolete fields from InputMethodManager." into mnc-dev

commit | commitdiff | tree

Dan Sandler [Tue, 12 May 2015 19:14:46 +0000 (19:14 +0000)]

am 81246cec: am dbd90f03: Merge "Tests for Notification object construction and parceling." into mnc-dev

* commit '81246cec2d631faa08089c158f8fa6a3bfd517b2':
Tests for Notification object construction and parceling.

commit | commitdiff | tree

Jason Monk [Tue, 12 May 2015 19:11:40 +0000 (19:11 +0000)]

am c08511e4: am a89893fc: am ba6a72fd: Merge "Fix crash in setup wizard" into mnc-dev

* commit 'c08511e417dc3a2b106be1e3e5ec4fe0211c8e28':
Fix crash in setup wizard

commit | commitdiff | tree

Dan Sandler [Tue, 12 May 2015 18:57:59 +0000 (18:57 +0000)]

am dbd90f03: Merge "Tests for Notification object construction and parceling." into mnc-dev

* commit 'dbd90f032971d59bfb8e0fd2964a3ecb0a9843bd':
Tests for Notification object construction and parceling.

commit | commitdiff | tree

Jason Monk [Tue, 12 May 2015 18:57:54 +0000 (18:57 +0000)]

am a89893fc: am ba6a72fd: Merge "Fix crash in setup wizard" into mnc-dev

* commit 'a89893fc60161ff75d862c9e6bbc34665edb6aa4':
Fix crash in setup wizard

commit | commitdiff | tree

Wale Ogunwale [Sat, 2 May 2015 03:39:18 +0000 (20:39 -0700)]

Determine if TaskRecord is privilaged from creating ActivityInfo.

It is not reliable to try to get it from the process since it might
not be running yet.

Bug: 20016740
Change-Id: If3e748a97015c6623741d9374ab4ed1ed5f4b11f

commit | commitdiff | tree

Dan Sandler [Tue, 12 May 2015 18:51:02 +0000 (18:51 +0000)]

Merge "Tests for Notification object construction and parceling." into mnc-dev

commit | commitdiff | tree

Jason Monk [Tue, 12 May 2015 18:47:28 +0000 (18:47 +0000)]

am ba6a72fd: Merge "Fix crash in setup wizard" into mnc-dev

* commit 'ba6a72fd668c5396e2dc903806c915233bed43c7':
Fix crash in setup wizard

commit | commitdiff | tree

John Spurlock [Mon, 11 May 2015 20:00:09 +0000 (16:00 -0400)]

Zen: Ringer mode integration fixes.

- Properly mute media + alarm streams in total silence.
- Allow system components to update the "ringer mode affected"
streams dynamically.
- Improve dumpsys output for ringer mode streams (include names).
- Remember last ringer mode properly when entering dnd via a
volume down (so we can restore it properly when exiting).

Bug: 20854925
Bug: 20950463
Bug: 20756527
Change-Id: I80afc1f639ff802c541020e25ade1b23e9997ef9

commit | commitdiff | tree

Jason Monk [Tue, 12 May 2015 18:37:23 +0000 (18:37 +0000)]

Merge "Fix crash in setup wizard" into mnc-dev

commit | commitdiff | tree

Jason Monk [Tue, 12 May 2015 18:20:25 +0000 (14:20 -0400)]

Fix crash in setup wizard

Clear out any unhandled worker messages before stopping tracking.

Bug: 21048197
Change-Id: I3792215a1e7799bdb93587cd7158c4d5d86de348

commit | commitdiff | tree

Rich Slogar [Tue, 12 May 2015 18:14:09 +0000 (18:14 +0000)]

am fd65b95c: am 3851b473: am 389d5ac6: am 353232ec: am b97afd41: am a27dd186: am e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs

* commit 'fd65b95ccd2426e7ff3a4a063ae15913c1d84fdb':
docs: renderscript using gradle settings

commit | commitdiff | tree

Yohei Yukawa [Tue, 12 May 2015 18:11:27 +0000 (11:11 -0700)]

Remove obsolete fields from InputMethodManager.

IMM#mViewTopLeft and IMM#mViewToScreenMatrix are no longer used.
They should have not been removed in
I4a577bfd02b37b9e56c80b8b41bb25afa95dd8ef.

Change-Id: Ia685956c8f7dda1143135345ee9a3873705975ef

commit | commitdiff | tree

Wei Jia [Tue, 12 May 2015 18:09:59 +0000 (18:09 +0000)]

am 2ffe53c7: am b5e56d8e: am 0cd3881a: Merge "MediaSync: rename bufferIndex to bufferId." into mnc-dev

* commit '2ffe53c7647367467ff25060b3e972e36cc90602':
MediaSync: rename bufferIndex to bufferId.

commit | commitdiff | tree

Olawale Ogunwale [Tue, 12 May 2015 18:09:55 +0000 (18:09 +0000)]

am ae5d653d: am dc797d5b: am e0b2cad0: Merge "Change attribute values per API council." into mnc-dev

* commit 'ae5d653d6966216eaa16f4083bb9e4cbab074642':
Change attribute values per API council.

commit | commitdiff | tree

Wale Ogunwale [Tue, 12 May 2015 18:09:50 +0000 (18:09 +0000)]

am 71617afc: am eadffbc6: am 2a857f00: Merge "Move visibleBehind activities into stop state when sleeping/powerDown" into mnc-dev

* commit '71617afc2c4c7ac8cb731d994284f10eaa1acf33':
Move visibleBehind activities into stop state when sleeping/powerDown

commit | commitdiff | tree

P.Y. Laligand [Tue, 12 May 2015 18:09:45 +0000 (18:09 +0000)]

am 86126f2f: (-s ours) am d9a87d7c: am e6c47686: Merge "DO NOT MERGE - Display mode switches." into mnc-dev

* commit '86126f2f7818f910d8eff19614c55b8dfc196793':
DO NOT MERGE - Display mode switches.

commit | commitdiff | tree

Doris Liu [Tue, 12 May 2015 18:09:40 +0000 (18:09 +0000)]

am 28be05e5: am 160f120c: am 4b403557: Merge "Avoid setting mCurFrame to -1" into mnc-dev

* commit '28be05e56440e0fab65e6bbda31f1594137b0679':
Avoid setting mCurFrame to -1

commit | commitdiff | tree

Alex Klyubin [Tue, 12 May 2015 18:09:35 +0000 (18:09 +0000)]

am 586123a0: am 2fa064d7: am 03064e25: Merge "Link to magic constants used by AndroidKeyStore API." into mnc-dev

* commit '586123a0e53b9269945ebe0cccb11c869a273eff':
Link to magic constants used by AndroidKeyStore API.

commit | commitdiff | tree

Rich Slogar [Tue, 12 May 2015 18:06:03 +0000 (18:06 +0000)]

am 3851b473: am 389d5ac6: am 353232ec: am b97afd41: am a27dd186: am e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs

* commit '3851b473c0784129bddc0ecc0822f8fa8bbf6235':
docs: renderscript using gradle settings

commit | commitdiff | tree

Dianne Hackborn [Tue, 12 May 2015 00:59:19 +0000 (17:59 -0700)]

Always use REGISTERED_ONLY when appropriate.

Previously we would only check mProcessesReady when going
through the public calls to send broadcasts; now handle it
even if the activity manager is calling its internal
implementation.

Change-Id: I702b4cb85b35a7a051ef05c9875a39f5fa03f0f1

commit | commitdiff | tree

Wei Jia [Tue, 12 May 2015 18:01:50 +0000 (18:01 +0000)]

am b5e56d8e: am 0cd3881a: Merge "MediaSync: rename bufferIndex to bufferId." into mnc-dev

* commit 'b5e56d8e86cce218c531ac421442d7523a38cc46':
MediaSync: rename bufferIndex to bufferId.

commit | commitdiff | tree

Olawale Ogunwale [Tue, 12 May 2015 18:01:44 +0000 (18:01 +0000)]

am dc797d5b: am e0b2cad0: Merge "Change attribute values per API council." into mnc-dev

* commit 'dc797d5b5c3e61784a3667eeff6b6d91af4ffb67':
Change attribute values per API council.

commit | commitdiff | tree

Wale Ogunwale [Tue, 12 May 2015 18:01:39 +0000 (18:01 +0000)]

am eadffbc6: am 2a857f00: Merge "Move visibleBehind activities into stop state when sleeping/powerDown" into mnc-dev

* commit 'eadffbc6fb378bf634dcbbb911d38d3ae43bd006':
Move visibleBehind activities into stop state when sleeping/powerDown

commit | commitdiff | tree

P.Y. Laligand [Tue, 12 May 2015 18:01:30 +0000 (18:01 +0000)]

am d9a87d7c: am e6c47686: Merge "DO NOT MERGE - Display mode switches." into mnc-dev

* commit 'd9a87d7c748bc2c396df45aba656e30f134e3154':
DO NOT MERGE - Display mode switches.

commit | commitdiff | tree

Doris Liu [Tue, 12 May 2015 18:01:25 +0000 (18:01 +0000)]

am 160f120c: am 4b403557: Merge "Avoid setting mCurFrame to -1" into mnc-dev

* commit '160f120c0b9b8a43b6d4a667a298353720b41bae':
Avoid setting mCurFrame to -1

commit | commitdiff | tree

Alex Klyubin [Tue, 12 May 2015 18:01:20 +0000 (18:01 +0000)]

am 2fa064d7: am 03064e25: Merge "Link to magic constants used by AndroidKeyStore API." into mnc-dev

* commit '2fa064d7e209bc9d75ab86eb4b16db8a56dc299e':
Link to magic constants used by AndroidKeyStore API.

commit | commitdiff | tree

Christopher Tate [Tue, 12 May 2015 18:00:48 +0000 (18:00 +0000)]

am ec8b095c: am d990e411: am 54415439: Merge "Deprecate Context.MODE_MULTI_PROCESS" into mnc-dev

* commit 'ec8b095cdd2b6dfbe7225580e004cf2c03975468':
Deprecate Context.MODE_MULTI_PROCESS

commit | commitdiff | tree

Chris Craik [Tue, 12 May 2015 18:00:43 +0000 (18:00 +0000)]

am 1d0b13b7: am db05ea90: am d2c05188: Merge "Fix build - Revert "Revert "Use default constructor to get anti-aliasing""" into mnc-dev

* commit '1d0b13b74797b27bd431d68f25fdd5e7c5ec751a':
Fix build - Revert "Revert "Use default constructor to get anti-aliasing""

commit | commitdiff | tree

Rich Slogar [Tue, 12 May 2015 17:59:51 +0000 (17:59 +0000)]

am 389d5ac6: am 353232ec: am b97afd41: am a27dd186: am e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs

* commit '389d5ac6ac974f171c12eb608eb8a3e2cad120f8':
docs: renderscript using gradle settings

commit | commitdiff | tree

Alex Klyubin [Tue, 12 May 2015 17:49:28 +0000 (17:49 +0000)]

am 80beff6d: am 797fe04b: am 15a7bb20: Merge "Move PointFormat constants into parent class." into mnc-dev

* commit '80beff6da2220f7e1df2ad00a54980fd642b076d':
Move PointFormat constants into parent class.

commit | commitdiff | tree

Christopher Tate [Tue, 12 May 2015 17:49:26 +0000 (17:49 +0000)]

am d990e411: am 54415439: Merge "Deprecate Context.MODE_MULTI_PROCESS" into mnc-dev

* commit 'd990e4118a1688847e6fba2f9fcf1ed4532a6f46':
Deprecate Context.MODE_MULTI_PROCESS

commit | commitdiff | tree

Chris Craik [Tue, 12 May 2015 17:49:24 +0000 (17:49 +0000)]

am 99aac0fc: am f3aad322: am fd41cf0c: Merge "Revert "Use default constructor to get anti-aliasing"" into mnc-dev

* commit '99aac0fc62a0b6f28bc732cd2153f8883ec7f09f':
Revert "Use default constructor to get anti-aliasing"

commit | commitdiff | tree

Chris Craik [Tue, 12 May 2015 17:49:22 +0000 (17:49 +0000)]

am db05ea90: am d2c05188: Merge "Fix build - Revert "Revert "Use default constructor to get anti-aliasing""" into mnc-dev

* commit 'db05ea901041258a64477c51456c9092a826d0cf':
Fix build - Revert "Revert "Use default constructor to get anti-aliasing""

commit | commitdiff | tree

Rich Slogar [Tue, 12 May 2015 17:48:30 +0000 (17:48 +0000)]

am 353232ec: am b97afd41: am a27dd186: am e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs

* commit '353232ecee06d1828d8628c4e3917e3b428485aa':
docs: renderscript using gradle settings

commit | commitdiff | tree

Wei Jia [Tue, 12 May 2015 17:47:38 +0000 (17:47 +0000)]

am 0cd3881a: Merge "MediaSync: rename bufferIndex to bufferId." into mnc-dev

* commit '0cd3881aafe40a191db1bd6ff1e1723f25bbb6b0':
MediaSync: rename bufferIndex to bufferId.

commit | commitdiff | tree

Olawale Ogunwale [Tue, 12 May 2015 17:47:30 +0000 (17:47 +0000)]

am e0b2cad0: Merge "Change attribute values per API council." into mnc-dev

* commit 'e0b2cad093760478e59a4aee5a7af43af2789db6':
Change attribute values per API council.

commit | commitdiff | tree

Wale Ogunwale [Tue, 12 May 2015 17:47:25 +0000 (17:47 +0000)]

am 2a857f00: Merge "Move visibleBehind activities into stop state when sleeping/powerDown" into mnc-dev

* commit '2a857f00110c448d702ffa4ee998dfd78688fa21':
Move visibleBehind activities into stop state when sleeping/powerDown

commit | commitdiff | tree

P.Y. Laligand [Tue, 12 May 2015 17:47:21 +0000 (17:47 +0000)]

am e6c47686: Merge "DO NOT MERGE - Display mode switches." into mnc-dev

* commit 'e6c47686f62643d3399218eef4728c22358cbcfb':
DO NOT MERGE - Display mode switches.

commit | commitdiff | tree

Doris Liu [Tue, 12 May 2015 17:47:17 +0000 (17:47 +0000)]

am 4b403557: Merge "Avoid setting mCurFrame to -1" into mnc-dev

* commit '4b403557bca7b622c187c3b06814e2118ec7d985':
Avoid setting mCurFrame to -1

commit | commitdiff | tree

Alex Klyubin [Tue, 12 May 2015 17:47:12 +0000 (17:47 +0000)]

am 03064e25: Merge "Link to magic constants used by AndroidKeyStore API." into mnc-dev

* commit '03064e25b284d7ee99563658c5966ee590f925f6':
Link to magic constants used by AndroidKeyStore API.

commit | commitdiff | tree

Chris Craik [Tue, 12 May 2015 17:28:14 +0000 (10:28 -0700)]

Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""

Fix import

This reverts commit 7ed1431c83286abc83b9e5afc45fbd21ecb777b1.

Change-Id: Id93eba3ed1d47a90384ba20dea6f74d78755792b

commit | commitdiff | tree

Wei Jia [Tue, 12 May 2015 17:43:46 +0000 (17:43 +0000)]

Merge "MediaSync: rename bufferIndex to bufferId." into mnc-dev

commit | commitdiff | tree

Olawale Ogunwale [Tue, 12 May 2015 17:43:02 +0000 (17:43 +0000)]

Merge "Change attribute values per API council." into mnc-dev

commit | commitdiff | tree

Wale Ogunwale [Tue, 12 May 2015 17:39:58 +0000 (17:39 +0000)]

Merge "Move visibleBehind activities into stop state when sleeping/powerDown" into mnc-dev

commit | commitdiff | tree

P.Y. Laligand [Tue, 12 May 2015 17:39:55 +0000 (17:39 +0000)]

Merge "DO NOT MERGE - Display mode switches." into mnc-dev

commit | commitdiff | tree

Wei Jia [Tue, 12 May 2015 00:34:46 +0000 (17:34 -0700)]

MediaSync: rename bufferIndex to bufferId.

Bug: 20887706
Change-Id: I98887832bc2211614a19a3718b46d6da100f6c9b

commit | commitdiff | tree

Rich Slogar [Tue, 12 May 2015 17:36:17 +0000 (17:36 +0000)]

am b97afd41: am a27dd186: am e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs

* commit 'b97afd418558fbe5cf37a17302a84a9d907490e6':
docs: renderscript using gradle settings

commit | commitdiff | tree

Christopher Tate [Tue, 12 May 2015 17:33:07 +0000 (17:33 +0000)]

am 54415439: Merge "Deprecate Context.MODE_MULTI_PROCESS" into mnc-dev

* commit '54415439ca8d286c4efaf975a54fe0cc7872c86b':
Deprecate Context.MODE_MULTI_PROCESS

commit | commitdiff | tree

Alex Klyubin [Tue, 12 May 2015 17:33:05 +0000 (17:33 +0000)]

am 797fe04b: am 15a7bb20: Merge "Move PointFormat constants into parent class." into mnc-dev

* commit '797fe04b6baa62d454d33a732f2be838b0f2ed07':
Move PointFormat constants into parent class.

commit | commitdiff | tree

Chris Craik [Tue, 12 May 2015 17:33:03 +0000 (17:33 +0000)]

am d2c05188: Merge "Fix build - Revert "Revert "Use default constructor to get anti-aliasing""" into mnc-dev

* commit 'd2c05188b669256ab9d6024ad5793e0ca891fed0':
Fix build - Revert "Revert "Use default constructor to get anti-aliasing""

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help