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

Amith Yamasani [Tue, 22 Jul 2014 00:21:35 +0000 (00:21 +0000)]

am 20064ee3: am f0b2364b: am ee5c41f5: Merge "Fix a security exception when checking cross-profile caller-id cap." into lmp-dev

* commit '20064ee3435d814d7974414d4c29cbe1bb254ef1':
Fix a security exception when checking cross-profile caller-id cap.

commit | commitdiff | tree

Amith Yamasani [Tue, 22 Jul 2014 00:17:18 +0000 (00:17 +0000)]

am 4fc62368: am ff053445: am f6feac69: API Review: Improvements to RestrictionsManager API

* commit '4fc623682a039650d86c4ccb87da66191573e2e3':
API Review: Improvements to RestrictionsManager API

commit | commitdiff | tree

Amith Yamasani [Tue, 22 Jul 2014 00:16:56 +0000 (00:16 +0000)]

am f0b2364b: am ee5c41f5: Merge "Fix a security exception when checking cross-profile caller-id cap." into lmp-dev

* commit 'f0b2364be972cebd83825ff514f11fe84b04afce':
Fix a security exception when checking cross-profile caller-id cap.

commit | commitdiff | tree

Amith Yamasani [Tue, 22 Jul 2014 00:12:40 +0000 (00:12 +0000)]

am ff053445: am f6feac69: API Review: Improvements to RestrictionsManager API

* commit 'ff053445f8b81ca4e7ab57feb981dbcc34ddb569':
API Review: Improvements to RestrictionsManager API

commit | commitdiff | tree

Amith Yamasani [Tue, 22 Jul 2014 00:12:39 +0000 (00:12 +0000)]

am ee5c41f5: Merge "Fix a security exception when checking cross-profile caller-id cap." into lmp-dev

* commit 'ee5c41f5360226c2579055a787da875e1a5ada90':
Fix a security exception when checking cross-profile caller-id cap.

commit | commitdiff | tree

Jean-Michel Trivi [Tue, 22 Jul 2014 00:11:11 +0000 (00:11 +0000)]

am 7fad3e7a: am 7f12d010: am 25f47ef4: Merge "New MediaFormat keys for AAC" into lmp-dev

* commit '7fad3e7a9f5d74f8f20a14d2bc4f06517640df3f':
New MediaFormat keys for AAC

commit | commitdiff | tree

Amith Yamasani [Tue, 22 Jul 2014 00:08:25 +0000 (00:08 +0000)]

am f6feac69: API Review: Improvements to RestrictionsManager API

* commit 'f6feac69abe5427e0ee89f2721a4d825e8a84fb0':
API Review: Improvements to RestrictionsManager API

commit | commitdiff | tree

Jean-Michel Trivi [Tue, 22 Jul 2014 00:06:25 +0000 (00:06 +0000)]

am 7f12d010: am 25f47ef4: Merge "New MediaFormat keys for AAC" into lmp-dev

* commit '7f12d01093248e67879c96bf333e85128933c6d6':
New MediaFormat keys for AAC

commit | commitdiff | tree

Jinsuk Kim [Tue, 22 Jul 2014 00:04:36 +0000 (00:04 +0000)]

am 1bda03fe: am 6f5652c9: am aec45c28: Revert "Send TV app the intent for the new active source"

* commit '1bda03fe07b7e35aac7079e52635f4727afab871':
Revert "Send TV app the intent for the new active source"

commit | commitdiff | tree

Amith Yamasani [Fri, 18 Jul 2014 22:19:22 +0000 (15:19 -0700)]

API Review: Improvements to RestrictionsManager API

Use an activity intent for local approval instead of a type.
Use PeristableBundle instead of Bundle.
Pass requestId as an explicit argument in cases where it's required.

Bug: 16400892
Change-Id: Id882033f17c39aa9cd63a7eeb73bb7b51f98cf5b

commit | commitdiff | tree

Jean-Michel Trivi [Tue, 22 Jul 2014 00:02:17 +0000 (00:02 +0000)]

am 25f47ef4: Merge "New MediaFormat keys for AAC" into lmp-dev

* commit '25f47ef4b11116fae9ca1cd3edc328435e56a194':
New MediaFormat keys for AAC

commit | commitdiff | tree

Jinsuk Kim [Tue, 22 Jul 2014 00:00:11 +0000 (00:00 +0000)]

am 6f5652c9: am aec45c28: Revert "Send TV app the intent for the new active source"

* commit '6f5652c9841346df3fa9eaa530590688c1b22a15':
Revert "Send TV app the intent for the new active source"

commit | commitdiff | tree

Jinsuk Kim [Mon, 21 Jul 2014 23:55:50 +0000 (23:55 +0000)]

am aec45c28: Revert "Send TV app the intent for the new active source"

* commit 'aec45c28846652185d47dd74abe86fc2f0b8c546':
Revert "Send TV app the intent for the new active source"

commit | commitdiff | tree

Jinsuk Kim [Mon, 21 Jul 2014 23:52:39 +0000 (23:52 +0000)]

Revert "Send TV app the intent for the new active source"

This reverts commit 9808af71a190844cd5eb493d87870238a31fa408.

Change-Id: I0e019534c07b230173230d064c6d8bc389fafcbc

commit | commitdiff | tree

Jinsuk Kim [Mon, 21 Jul 2014 23:34:10 +0000 (23:34 +0000)]

am caff7008: am 8ea9bdbf: am 9808af71: Send TV app the intent for the new active source

* commit 'caff7008c62fa790142f35ca74625f1659cce049':
Send TV app the intent for the new active source

commit | commitdiff | tree

Jinsuk Kim [Mon, 21 Jul 2014 23:28:59 +0000 (23:28 +0000)]

am 8ea9bdbf: am 9808af71: Send TV app the intent for the new active source

* commit '8ea9bdbf827264315a46cdb11fb718db7a10f655':
Send TV app the intent for the new active source

commit | commitdiff | tree

Adam Lesinski [Mon, 21 Jul 2014 23:26:08 +0000 (23:26 +0000)]

am 75472ca8: am dfefa5e2: am 3702b836: Merge "Change UsageStatsService to check uses-permission" into lmp-dev

* commit '75472ca8ab4ee9329ba9a8b0401933816ee91e06':
Change UsageStatsService to check uses-permission

commit | commitdiff | tree

Yorke Lee [Mon, 21 Jul 2014 23:26:03 +0000 (23:26 +0000)]

am 87b43bee: am 5dcfed0b: am 82c0b5df: Expose call settings as public API (1/3)

* commit '87b43bee205ea7a16b7126fb41c57da8890b4cb5':
Expose call settings as public API (1/3)

commit | commitdiff | tree

Jinsuk Kim [Mon, 21 Jul 2014 23:22:44 +0000 (23:22 +0000)]

am 9808af71: Send TV app the intent for the new active source

* commit '9808af71a190844cd5eb493d87870238a31fa408':
Send TV app the intent for the new active source

commit | commitdiff | tree

Adam Lesinski [Mon, 21 Jul 2014 23:21:05 +0000 (23:21 +0000)]

am dfefa5e2: am 3702b836: Merge "Change UsageStatsService to check uses-permission" into lmp-dev

* commit 'dfefa5e24776902533cfc9bc061cf0bf493ff449':
Change UsageStatsService to check uses-permission

commit | commitdiff | tree

Yorke Lee [Mon, 21 Jul 2014 23:21:01 +0000 (23:21 +0000)]

am 5dcfed0b: am 82c0b5df: Expose call settings as public API (1/3)

* commit '5dcfed0b8df224068b8fff332d9399f7711283ba':
Expose call settings as public API (1/3)

commit | commitdiff | tree

Jinsuk Kim [Mon, 21 Jul 2014 08:14:44 +0000 (17:14 +0900)]

Send TV app the intent for the new active source

When signalled by an external CEC device about to become a new active
source, TIF(TvInputHardwareManager) sends an intent for TV app to tune to
the input mapped to the device.

Change-Id: I29b28a4365d1454a8bbe947ddb5df4371960c71a

commit | commitdiff | tree

Adam Lesinski [Mon, 21 Jul 2014 23:17:47 +0000 (23:17 +0000)]

am 3702b836: Merge "Change UsageStatsService to check uses-permission" into lmp-dev

* commit '3702b836126fa77492faaa42bbd0ea1f4c5143f8':
Change UsageStatsService to check uses-permission

commit | commitdiff | tree

Yorke Lee [Mon, 21 Jul 2014 23:17:41 +0000 (23:17 +0000)]

am 82c0b5df: Expose call settings as public API (1/3)

* commit '82c0b5df73ead3f84f1a59818f4b5bab47ab9957':
Expose call settings as public API (1/3)

commit | commitdiff | tree

Yorke Lee [Mon, 21 Jul 2014 22:57:17 +0000 (15:57 -0700)]

Expose call settings as public API (1/3)

Other settings activities like wifi settings, mobile network settings
etc are all accessible by third party apps via public intents, so
make CallFeaturesSettings similarly available.
Bug: 16298644
Change-Id: Ia615797e20f396a38fe382f3a2d54ec41c5249ef

commit | commitdiff | tree

Ying Wang [Mon, 21 Jul 2014 22:42:04 +0000 (22:42 +0000)]

am 044a4fc9: am 7c5fe1db: am 1e976fd5: Build framework.jar with multidex support.

* commit '044a4fc9d4b4e13c509be5a0929fd785dd98e178':
Build framework.jar with multidex support.

commit | commitdiff | tree

Amith Yamasani [Mon, 21 Jul 2014 22:37:09 +0000 (22:37 +0000)]

am 5d5fa324: am b0cae189: am f8b67f1f: Rename setApplicationBlocked to setApplicationHidden

* commit '5d5fa324871437c3bd240ae231adae9bbea6b0ba':
Rename setApplicationBlocked to setApplicationHidden

commit | commitdiff | tree

Ying Wang [Mon, 21 Jul 2014 22:36:41 +0000 (22:36 +0000)]

am 7c5fe1db: am 1e976fd5: Build framework.jar with multidex support.

* commit '7c5fe1dbd3c50eaec11e7f799f5e46df18dd31ee':
Build framework.jar with multidex support.

commit | commitdiff | tree

Amith Yamasani [Mon, 21 Jul 2014 22:32:25 +0000 (22:32 +0000)]

am b0cae189: am f8b67f1f: Rename setApplicationBlocked to setApplicationHidden

* commit 'b0cae1897384f7175ec3b9ee08fd535fff1d6e51':
Rename setApplicationBlocked to setApplicationHidden

commit | commitdiff | tree

Ying Wang [Mon, 21 Jul 2014 22:29:48 +0000 (22:29 +0000)]

am 1e976fd5: Build framework.jar with multidex support.

* commit '1e976fd50f83a43a1df49a6670f813a57d1a625a':
Build framework.jar with multidex support.

commit | commitdiff | tree

Amith Yamasani [Mon, 21 Jul 2014 22:25:15 +0000 (22:25 +0000)]

am f8b67f1f: Rename setApplicationBlocked to setApplicationHidden

* commit 'f8b67f1f4e34664854421d92efd0955d405c7a71':
Rename setApplicationBlocked to setApplicationHidden

commit | commitdiff | tree

Alan Viverette [Mon, 21 Jul 2014 22:24:19 +0000 (22:24 +0000)]

am 3da5022c: am 75dbf713: am c912f9f5: Merge "Move insets out of edit text background" into lmp-dev

* commit '3da5022cfdcec9a893346d143c8778d18a546035':
Move insets out of edit text background

commit | commitdiff | tree

Alan Viverette [Mon, 21 Jul 2014 22:24:15 +0000 (22:24 +0000)]

am a65709c0: am 7094ec0f: am 748dd3c4: Merge "Always apply surface insets" into lmp-dev

* commit 'a65709c05bb825af83156f14242e05e81976fa4f':
Always apply surface insets

commit | commitdiff | tree

Craig Mautner [Mon, 21 Jul 2014 22:23:58 +0000 (22:23 +0000)]

am 456e8fc5: am e62332fb: am e15321a5: Merge "Don\'t create a delegate for null callbacks." into lmp-dev

* commit '456e8fc54b588cc291befe5ebeb3cb01e1f7e7fd':
Don't create a delegate for null callbacks.

commit | commitdiff | tree

Ying Wang [Mon, 21 Jul 2014 21:40:42 +0000 (14:40 -0700)]

Build framework.jar with multidex support.

We don't need the framework/framework2 split now with the multidex
support.

Change-Id: I30ee5c7e24df87b2c54e854f17fbf0b5adef4c60

commit | commitdiff | tree

Amith Yamasani [Sat, 19 Jul 2014 22:44:09 +0000 (15:44 -0700)]

Rename setApplicationBlocked to setApplicationHidden

This corrects the expected behavior of the app state. Hidden apps
can be installed by the store to be brought out of hidden state.

Bug: 16191518
Change-Id: Id128ce971ceee99ba1dea14ba07ce03bd8d77335

commit | commitdiff | tree

Alan Viverette [Mon, 21 Jul 2014 22:05:39 +0000 (22:05 +0000)]

am 75dbf713: am c912f9f5: Merge "Move insets out of edit text background" into lmp-dev

* commit '75dbf713c8e2ed10215ff4d08b5e40475c8e3104':
Move insets out of edit text background

commit | commitdiff | tree

Alan Viverette [Mon, 21 Jul 2014 22:05:35 +0000 (22:05 +0000)]

am 7094ec0f: am 748dd3c4: Merge "Always apply surface insets" into lmp-dev

* commit '7094ec0f6344823cdf1525f52bf70f2f0230d548':
Always apply surface insets

commit | commitdiff | tree

Alan Viverette [Mon, 21 Jul 2014 21:59:21 +0000 (21:59 +0000)]

am c912f9f5: Merge "Move insets out of edit text background" into lmp-dev

* commit 'c912f9f5f935eafdab235182627088366b8cff59':
Move insets out of edit text background

commit | commitdiff | tree

Alan Viverette [Mon, 21 Jul 2014 21:59:18 +0000 (21:59 +0000)]

am 748dd3c4: Merge "Always apply surface insets" into lmp-dev

* commit '748dd3c4ef4cf2fc5252b79f1854464f4070c89c':
Always apply surface insets

commit | commitdiff | tree

Craig Mautner [Mon, 21 Jul 2014 21:42:22 +0000 (21:42 +0000)]

am e62332fb: am e15321a5: Merge "Don\'t create a delegate for null callbacks." into lmp-dev

* commit 'e62332fbcbc9acca2b8f694ff890ac0b1301283c':
Don't create a delegate for null callbacks.

commit | commitdiff | tree

Craig Mautner [Mon, 21 Jul 2014 21:38:43 +0000 (21:38 +0000)]

am e15321a5: Merge "Don\'t create a delegate for null callbacks." into lmp-dev

* commit 'e15321a50547cd5461b69e0a78f76343b66d184f':
Don't create a delegate for null callbacks.

commit | commitdiff | tree

Jeff Sharkey [Mon, 21 Jul 2014 20:40:37 +0000 (20:40 +0000)]

am 31bbf83f: am c7a62d72: am a56503ee: Detect bundled app ABI for cluster-style layout.

* commit '31bbf83f930e3aef8e5aba865b3a29a9127a818b':
Detect bundled app ABI for cluster-style layout.

commit | commitdiff | tree

Jeff Sharkey [Mon, 21 Jul 2014 20:36:40 +0000 (20:36 +0000)]

am c7a62d72: am a56503ee: Detect bundled app ABI for cluster-style layout.

* commit 'c7a62d728f1546e8feda4f1d22a835593c8d36a3':
Detect bundled app ABI for cluster-style layout.

commit | commitdiff | tree

Jeff Sharkey [Mon, 21 Jul 2014 20:32:04 +0000 (20:32 +0000)]

am a56503ee: Detect bundled app ABI for cluster-style layout.

* commit 'a56503ee4f48c4d1b4c5ce13eeccc11a49f44a25':
Detect bundled app ABI for cluster-style layout.

commit | commitdiff | tree

destradaa [Mon, 21 Jul 2014 20:29:44 +0000 (20:29 +0000)]

am 0c391da3: am 3fafcc8a: am d26d2bf6: Merge "Fix GpsLocationProvider to return GpsStatus and Nmea events. b/16393308" into lmp-dev

* commit '0c391da32542c1186b81128e9a6725eb5744999c':
Fix GpsLocationProvider to return GpsStatus and Nmea events. b/16393308

commit | commitdiff | tree

Jeff Sharkey [Mon, 21 Jul 2014 20:01:59 +0000 (13:01 -0700)]

Detect bundled app ABI for cluster-style layout.

Now that build system switched to cluster-style layout for bundled
apps, we need to detect primary/secondary ABI based on that layout.

Bug: 16456263
Change-Id: If6daf60ee1815bb6fde560a0c373b4f2bc8bd3a8

commit | commitdiff | tree

destradaa [Mon, 21 Jul 2014 20:25:22 +0000 (20:25 +0000)]

am 3fafcc8a: am d26d2bf6: Merge "Fix GpsLocationProvider to return GpsStatus and Nmea events. b/16393308" into lmp-dev

* commit '3fafcc8acab04076f697208c2d342d9292007957':
Fix GpsLocationProvider to return GpsStatus and Nmea events. b/16393308

commit | commitdiff | tree

destradaa [Mon, 21 Jul 2014 20:20:52 +0000 (20:20 +0000)]

am d26d2bf6: Merge "Fix GpsLocationProvider to return GpsStatus and Nmea events. b/16393308" into lmp-dev

* commit 'd26d2bf6311113e0d1b25048898f4de7a4c39ed4':
Fix GpsLocationProvider to return GpsStatus and Nmea events. b/16393308

commit | commitdiff | tree

Andrew Lee [Mon, 21 Jul 2014 20:05:09 +0000 (20:05 +0000)]

am 5f129750: am 372a5616: am 0accc6a0: Merge "Add video call profile constructor which takes video state only." into lmp-dev

* commit '5f1297502a4a8dd6699798a180e103d0cfdec9ef':
Add video call profile constructor which takes video state only.

commit | commitdiff | tree

Andrew Lee [Mon, 21 Jul 2014 20:01:43 +0000 (20:01 +0000)]

am 372a5616: am 0accc6a0: Merge "Add video call profile constructor which takes video state only." into lmp-dev

* commit '372a5616af56d889fc038110321cd511fb690b91':
Add video call profile constructor which takes video state only.

commit | commitdiff | tree

Andrew Lee [Mon, 21 Jul 2014 19:57:29 +0000 (19:57 +0000)]

am 0accc6a0: Merge "Add video call profile constructor which takes video state only." into lmp-dev

* commit '0accc6a0d0d2778ab0ef3df4a50ff9ff89a33b71':
Add video call profile constructor which takes video state only.

commit | commitdiff | tree

Santos Cordon [Mon, 21 Jul 2014 19:49:14 +0000 (19:49 +0000)]

am 31e81ea6: am 59dcf65a: am a99cc3f9: Sent initial data to telecomm on connection creation. (1/3)

* commit '31e81ea6267582ddfd00ff75a1f8a7f9e46edcbb':
Sent initial data to telecomm on connection creation. (1/3)

commit | commitdiff | tree

Andres Morales [Mon, 21 Jul 2014 19:49:04 +0000 (19:49 +0000)]

am fca5a2d1: am c55c7dd7: am 47855ed4: Don\'t register PDBService if not available on device

* commit 'fca5a2d1e59a6645075c74ab32ed565d48f1c14c':
Don't register PDBService if not available on device

commit | commitdiff | tree

Santos Cordon [Mon, 21 Jul 2014 19:42:06 +0000 (19:42 +0000)]

am 59dcf65a: am a99cc3f9: Sent initial data to telecomm on connection creation. (1/3)

* commit '59dcf65a90249d149654613faaeb153e0d2ffe46':
Sent initial data to telecomm on connection creation. (1/3)

commit | commitdiff | tree

Andres Morales [Mon, 21 Jul 2014 19:42:01 +0000 (19:42 +0000)]

am c55c7dd7: am 47855ed4: Don\'t register PDBService if not available on device

* commit 'c55c7dd7aebeaa9ba08394008b5bbaf86f5214ed':
Don't register PDBService if not available on device

commit | commitdiff | tree

Santos Cordon [Mon, 21 Jul 2014 19:37:47 +0000 (19:37 +0000)]

am a99cc3f9: Sent initial data to telecomm on connection creation. (1/3)

* commit 'a99cc3f910d494a28db4d6ae6d6b3cd978a950a1':
Sent initial data to telecomm on connection creation. (1/3)

commit | commitdiff | tree

Andres Morales [Mon, 21 Jul 2014 19:37:44 +0000 (19:37 +0000)]

am 47855ed4: Don\'t register PDBService if not available on device

* commit '47855ed4c5f1d0b72de0ab153f6537a46d178930':
Don't register PDBService if not available on device

commit | commitdiff | tree

Andrew Lee [Mon, 21 Jul 2014 19:36:43 +0000 (19:36 +0000)]

am a4d34691: am 7f757f79: am aa2fc60d: Catch RemoteException when setting the camera or zoom.

* commit 'a4d34691d51f452e080df3414fb25df62f2022d0':
Catch RemoteException when setting the camera or zoom.

commit | commitdiff | tree

Santos Cordon [Mon, 21 Jul 2014 08:28:28 +0000 (01:28 -0700)]

Sent initial data to telecomm on connection creation. (1/3)

Telecomm was not sending the initial state for new connections forcing
the connection services to postpone when they set data on the connection
which resulted in hacky code. This CL makes use of a
ParcelableConnection to send the intial connection data.

Change-Id: If571414aba19fa1bb282e30632431962b8366cf4

commit | commitdiff | tree

Santos Cordon [Mon, 21 Jul 2014 19:24:44 +0000 (19:24 +0000)]

am a317b4b5: am 80397901: am 0be30edf: Revert "Change display Strings to CharSequence (1/2)"

* commit 'a317b4b560cfa9955b1a0f3d902f67b47df52678':
Revert "Change display Strings to CharSequence (1/2)"

commit | commitdiff | tree

RoboErik [Mon, 21 Jul 2014 19:24:36 +0000 (19:24 +0000)]

am 77519208: am 81042e1e: am cfd3f8ae: Deprecate apis that were replaced by sessions

* commit '775192087ab3de3997fb037d521616aa1f9c5a97':
Deprecate apis that were replaced by sessions

commit | commitdiff | tree

destradaa [Mon, 21 Jul 2014 19:24:31 +0000 (19:24 +0000)]

am 584ca2bf: am a4d0d8c2: am 77e1c1a5: Merge "Update GPS HAL raw measurements support." into lmp-dev

* commit '584ca2bf83097c8e3b321808e647b1a565f683ed':
Update GPS HAL raw measurements support.

commit | commitdiff | tree

Adam Powell [Mon, 21 Jul 2014 19:24:25 +0000 (19:24 +0000)]

am bf0fcd80: am 2b0d3fc7: am dd896d93: Merge "Sort ResolverActivity items based on UsageStats" into lmp-dev

* commit 'bf0fcd8047305c2d9015047d60396ff1d244898c':
Sort ResolverActivity items based on UsageStats

commit | commitdiff | tree

Santos Cordon [Mon, 21 Jul 2014 19:24:21 +0000 (19:24 +0000)]

am 43306695: am 1557474e: am b5e00844: Change display Strings to CharSequence (1/2)

* commit '433066955950e6112ae7708a97da522632960b1e':
Change display Strings to CharSequence (1/2)

commit | commitdiff | tree

Andrew Solovay [Mon, 21 Jul 2014 19:24:10 +0000 (19:24 +0000)]

am 8db40c45: am 469db690: am cf300d2f: am 30aa5924: am 643fa8d1: Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev

* commit '8db40c45ab44a004f66e87f206087cd043f0f1d5':
docs: Noted how singleTop affects "up" navigation.

commit | commitdiff | tree

Jean-Michel Trivi [Mon, 21 Jul 2014 19:24:06 +0000 (19:24 +0000)]

am c42de9d6: am 61734857: am 61b79634: Merge "AudioAttributes for SoundPool" into lmp-dev

* commit 'c42de9d6a622dc71d76927cfdef2cbb57c205f90':
AudioAttributes for SoundPool

commit | commitdiff | tree

Deepanshu Gupta [Mon, 21 Jul 2014 19:23:58 +0000 (19:23 +0000)]

am 37423bbb: am db2a5ff1: am 78d85419: Fix missing initial moveto in path definition.

* commit '37423bbbeab2822b39d859412aa80117a4b85282':
Fix missing initial moveto in path definition.

commit | commitdiff | tree

Craig Mautner [Mon, 21 Jul 2014 19:23:51 +0000 (19:23 +0000)]

am ca30ccb5: am 28d5d4df: am 52cf4df1: Merge "Rename flag and attribute per API council" into lmp-dev

* commit 'ca30ccb556f6814c5ac4352adb95c7eb22652d6b':
Rename flag and attribute per API council

commit | commitdiff | tree

Ricardo Cervera [Mon, 21 Jul 2014 19:23:45 +0000 (19:23 +0000)]

am d9f417de: am 2f08e6ea: am f47dab8b: am fef00111: am d73eb7f9: am 940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs

* commit 'd9f417dedc8f5bc610bb0ade0aeafdb9c5857f55':
docs: Added note suggesting use of Android Studio over ADT

commit | commitdiff | tree

Derek Sollenberger [Mon, 21 Jul 2014 19:23:39 +0000 (19:23 +0000)]

am 23d8fbc1: am 9a27e8f2: am 1bf087a9: Merge "Remove invalid SkASSERT that prevents us from running with SK_DEBUG" into lmp-dev

* commit '23d8fbc1d8f414f40b204c148e1c2f31079267c3':
Remove invalid SkASSERT that prevents us from running with SK_DEBUG

commit | commitdiff | tree

Yorke Lee [Mon, 21 Jul 2014 19:23:35 +0000 (19:23 +0000)]

am aebd7c1c: am b9105f15: am ec0197da: Merge "Add call log entries to all currently running users" into lmp-dev

* commit 'aebd7c1c6764a8535aaf29ba334225d1ea42dff7':
Add call log entries to all currently running users

commit | commitdiff | tree

Derek Sollenberger [Mon, 21 Jul 2014 19:23:25 +0000 (19:23 +0000)]

am 994bfa4b: am 61cc70a2: am 521830a7: Merge "Separate Canvas JNI code from the implementation." into lmp-dev

* commit '994bfa4b469186ffe08b7303ee9e56722c7dd576':
Separate Canvas JNI code from the implementation.

commit | commitdiff | tree

Robert Ly [Mon, 21 Jul 2014 19:23:15 +0000 (19:23 +0000)]

am 9c41be31: am d93a4d1b: am 077d5622: am 205196f1: am efca30d0: am 62c81ab5: docs: change copy for edu video

* commit '9c41be31b8bcff2ba3f4cf09d9f8bf0e7690fce1':
docs: change copy for edu video

commit | commitdiff | tree

Adrian Roos [Mon, 21 Jul 2014 19:22:54 +0000 (19:22 +0000)]

am 884a8f73: am 4f5106e7: am c1c28902: More user switching goodness

* commit '884a8f73afc8858cde395c5cd28d6f905a05780a':
More user switching goodness

commit | commitdiff | tree

Craig Mautner [Mon, 21 Jul 2014 19:22:30 +0000 (19:22 +0000)]

am ca22b33f: am b7bb95b0: am 02fd104f: Merge "Skip broadcasting to a receiver if the receiver seems to be dead"

* commit 'ca22b33f6026c5bfe1af32edb0890c9319f31d1e':
Skip broadcasting to a receiver if the receiver seems to be dead

commit | commitdiff | tree

Dan Sandler [Mon, 21 Jul 2014 19:21:38 +0000 (19:21 +0000)]

am 61681416: am 00c3f554: am 8bfa8dbc: Defend against null ApplicationInfos.

* commit '616814161410d9794d7de89a5f04742f74e622eb':
Defend against null ApplicationInfos.

commit | commitdiff | tree

Wonsik Kim [Mon, 21 Jul 2014 19:21:32 +0000 (19:21 +0000)]

am 168ec8b1: am 39ac147e: am 20c790cf: Merge "TIF: fix indexOfValue usage" into lmp-dev

* commit '168ec8b13227d9756dc4c49c3a0cd20a5f627776':
TIF: fix indexOfValue usage

commit | commitdiff | tree

Wonsik Kim [Mon, 21 Jul 2014 19:21:28 +0000 (19:21 +0000)]

am 8f3b99c4: am caed0312: am acbd8d4a: Merge "TIF: fix tvInputType attribute to match with TvInputInfo" into lmp-dev

* commit '8f3b99c4325259e15c05161fcff68690070c4ccc':
TIF: fix tvInputType attribute to match with TvInputInfo

commit | commitdiff | tree

Adrian Roos [Mon, 21 Jul 2014 19:21:18 +0000 (19:21 +0000)]

am 9b521513: am 35e21d40: am a727db86: Update LockPatternUtils to new alarm API

* commit '9b52151396d3a735a6f966f8c24e76df7cfb25ba':
Update LockPatternUtils to new alarm API

commit | commitdiff | tree

Niels Egberts [Mon, 21 Jul 2014 19:21:13 +0000 (19:21 +0000)]

am 8451acc7: am 1eb446a5: am 7a925857: New TtsSpan builders for money, electronic and telephone.

* commit '8451acc7e2fdca720098daea1937230375d62778':
New TtsSpan builders for money, electronic and telephone.

commit | commitdiff | tree

Jungshik Jang [Mon, 21 Jul 2014 19:21:06 +0000 (19:21 +0000)]

am 353dcd70: am 13dc029e: am 7506f4c9: Merge "Add two apis for one touch record." into lmp-dev

* commit '353dcd7034fa69f8061c2079be5523f5b4102387':
Add two apis for one touch record.

commit | commitdiff | tree

Ji-Hwan Lee [Mon, 21 Jul 2014 19:21:02 +0000 (19:21 +0000)]

am 6ed883cf: am 1dc7352e: am d0f94173: Merge "TIF: Extend multiple TV input per service for HDMI logical devices" into lmp-dev

* commit '6ed883cf469c99e45d4a53a5fd5b6e9fc7503fb4':
TIF: Extend multiple TV input per service for HDMI logical devices

commit | commitdiff | tree

Santos Cordon [Mon, 21 Jul 2014 19:20:57 +0000 (19:20 +0000)]

am 060452d8: am 5cafb03d: am e0cd9db8: Change telecomm APIs from protected to public (1/3)

* commit '060452d83dc4943ca2c7954dc9e2be8c86619815':
Change telecomm APIs from protected to public (1/3)

commit | commitdiff | tree

Jungshik Jang [Mon, 21 Jul 2014 19:20:47 +0000 (19:20 +0000)]

am d33d1732: am a86a6f2c: am 9d42d1f3: Merge "Do no send <Feature Abort> as response of <Feature Abort>" into lmp-dev

* commit 'd33d1732261446120fe85b67acde7097870d5b09':
Do no send <Feature Abort> as response of <Feature Abort>

commit | commitdiff | tree

Jinsuk Kim [Mon, 21 Jul 2014 19:20:43 +0000 (19:20 +0000)]

am d01a0137: am d4a48882: am 2a1ff5ad: Merge "Invoke callback for HdmiControlService.deviceSelect() for internal source" into lmp-dev

* commit 'd01a01374b6407c34b4b30ad74db25299f36fc07':
Invoke callback for HdmiControlService.deviceSelect() for internal source

commit | commitdiff | tree

Joe Onorato [Mon, 21 Jul 2014 19:20:37 +0000 (19:20 +0000)]

am 48fd198e: am 98de561e: am c35149b2: Move android.bluetooth and android.telephony to framework2.jar.

* commit '48fd198eb6e43f4777c3b5c6b625020bb84da9e0':
Move android.bluetooth and android.telephony to framework2.jar.

commit | commitdiff | tree

Jinsuk Kim [Mon, 21 Jul 2014 19:20:33 +0000 (19:20 +0000)]

am a5c8b021: am e51029b9: am 1e6393b8: Merge "TIF: Register IHdmiInputChangeListener to physical input manager" into lmp-dev

* commit 'a5c8b021023b786f918ee2bef33b99272f130628':
TIF: Register IHdmiInputChangeListener to physical input manager

commit | commitdiff | tree

Jesse Hall [Mon, 21 Jul 2014 19:20:28 +0000 (19:20 +0000)]

am c7777484: am c623c94c: am 65c75169: Merge "Add FEATURE_OPENGLES_EXTENSION_PACK_ES31A" into lmp-dev

* commit 'c7777484547894a7817ac4428e5890dcf817262c':
Add FEATURE_OPENGLES_EXTENSION_PACK_ES31A

commit | commitdiff | tree

Santos Cordon [Mon, 21 Jul 2014 19:20:23 +0000 (19:20 +0000)]

am e58e73f8: am 9f825c78: am 6a30817e: Merge "Move ACTION_CONNECTION_SERVICE into ConnectionService. (1/3)" into lmp-dev

* commit 'e58e73f87ed2510323f62729c7921ef5be46a826':
Move ACTION_CONNECTION_SERVICE into ConnectionService. (1/3)

commit | commitdiff | tree

Jae Seo [Mon, 21 Jul 2014 19:20:18 +0000 (19:20 +0000)]

am 31f31f10: am 0e29adb6: am bf1a0ff0: TIF: Add sendAppPrivateCommand()

* commit '31f31f10de63b562b2137c7ca7b22472bfb9a7e3':
TIF: Add sendAppPrivateCommand()

commit | commitdiff | tree

Evan Charlton [Mon, 21 Jul 2014 19:20:13 +0000 (19:20 +0000)]

am 3317fa7d: am 4c47b196: am e524ae5d: Merge "@hide CAPABILITY_CALL_PROVIDER" into lmp-dev

* commit '3317fa7d57d3a4a837b6663cff1139ffa318f29d':
@hide CAPABILITY_CALL_PROVIDER

commit | commitdiff | tree

Santos Cordon [Mon, 21 Jul 2014 19:20:07 +0000 (19:20 +0000)]

am c05da7f4: am 2f8900b1: am 829308f7: Rename InCallCall to ParcelableCall (1/2)

* commit 'c05da7f4bbc00efd7a142c4a237576e2f652a8a2':
Rename InCallCall to ParcelableCall (1/2)

commit | commitdiff | tree

Evan Charlton [Mon, 21 Jul 2014 19:20:02 +0000 (19:20 +0000)]

am 922562bc: am c248975a: am d9e0bfee: Merge "Rename setDestroy() to destroy()" into lmp-dev

* commit '922562bc8b6d4b8a6a2f434552fb66b145b15522':
Rename setDestroy() to destroy()

commit | commitdiff | tree

Santos Cordon [Mon, 21 Jul 2014 19:19:58 +0000 (19:19 +0000)]

am f52c7183: am d6afd919: am c27a00a0: Merge "Change incoming call intent to a TelecommManager method. (1/3)" into lmp-dev

* commit 'f52c718317c2dc50a9b671b36b3ad7b7ac9b2941':
Change incoming call intent to a TelecommManager method. (1/3)

commit | commitdiff | tree

Jean-Michel Trivi [Mon, 21 Jul 2014 19:19:53 +0000 (19:19 +0000)]

am 938ed815: am b3c1aa30: am 1b6c240b: Merge "Remove obsolete USAGE_NOTIFICATION_TELEPHONY_RINGTONE definition" into lmp-dev

* commit '938ed815c97e60132091129fef8fe4b863dfd529':
Remove obsolete USAGE_NOTIFICATION_TELEPHONY_RINGTONE definition

commit | commitdiff | tree

Youngsang Cho [Mon, 21 Jul 2014 19:19:29 +0000 (19:19 +0000)]

am c913ab48: am 854ac8f9: am bf1a3868: TIF: update documentation of TvInputInfo.getParentId()

* commit 'c913ab4853d1f2652aa47206191a0ce0db84ab2a':
TIF: update documentation of TvInputInfo.getParentId()

commit | commitdiff | tree

Sandeep Siddhartha [Mon, 21 Jul 2014 19:19:24 +0000 (19:19 +0000)]

am e85c634d: am 7c88cbf4: am 20a8b531: Fix synchronization issues in AlwaysOnHotwordDetector

* commit 'e85c634da4f2cca7f1fc5e73f399da0fc046edec':
Fix synchronization issues in AlwaysOnHotwordDetector

commit | commitdiff | tree

Dianne Hackborn [Mon, 21 Jul 2014 19:19:18 +0000 (19:19 +0000)]

am 65f62f23: am 39285ff1: am 1648dbb4: Merge "Fix issue #16400873: Apps that show ads as new tasks stay in recents..." into lmp-dev

* commit '65f62f236395b44a0c168f1ec72855197927a885':
Fix issue #16400873: Apps that show ads as new tasks stay in recents...

commit | commitdiff | tree

Evan Charlton [Mon, 21 Jul 2014 19:19:06 +0000 (19:19 +0000)]

am ae930cb8: am d5d9a4de: am 19e236f5: Merge "Rename PhoneAccountMetadata to PhoneAccount" into lmp-dev

* commit 'ae930cb836c784df45d76e9716610de91747ac24':
Rename PhoneAccountMetadata to PhoneAccount