OSDN Git Service
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
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
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
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
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
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"
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"
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
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
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
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
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)
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
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
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)
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
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.
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
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.
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
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
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
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
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
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
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
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.
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.
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.
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.
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
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
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
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.
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.
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)
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
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)
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
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
Andres Morales [Mon, 21 Jul 2014 19:16:32 +0000 (12:16 -0700)]
Don't register PDBService if not available on device
Bug:
16455896
Change-Id: If576ce8e837ba498f10848795706efb29e76974a
Andrew Lee [Mon, 21 Jul 2014 19:12:54 +0000 (19:12 +0000)]
am
7f757f79: am
aa2fc60d: Catch RemoteException when setting the camera or zoom.
* commit '
7f757f79880b7940b970bc0657831cd27dfb265f':
Catch RemoteException when setting the camera or zoom.
Andrew Lee [Mon, 21 Jul 2014 19:09:25 +0000 (19:09 +0000)]
am
aa2fc60d: Catch RemoteException when setting the camera or zoom.
* commit '
aa2fc60db26a5b9836efa74e2ec3f11c2be5f419':
Catch RemoteException when setting the camera or zoom.
Andrew Lee [Fri, 18 Jul 2014 23:48:46 +0000 (16:48 -0700)]
Catch RemoteException when setting the camera or zoom.
Bug:
16014280
Change-Id: I7542a0f294929fac589260ab596730d89948c89e
Santos Cordon [Mon, 21 Jul 2014 18:53:22 +0000 (18:53 +0000)]
am
80397901: am
0be30edf: Revert "Change display Strings to CharSequence (1/2)"
* commit '
80397901d67b46dc2ca49917adeb486c756408dc':
Revert "Change display Strings to CharSequence (1/2)"
Santos Cordon [Mon, 21 Jul 2014 18:48:47 +0000 (18:48 +0000)]
am
0be30edf: Revert "Change display Strings to CharSequence (1/2)"
* commit '
0be30edf78586a51d1b58c5326a412ae9bbd01d7':
Revert "Change display Strings to CharSequence (1/2)"
Santos Cordon [Mon, 21 Jul 2014 18:43:14 +0000 (18:43 +0000)]
Revert "Change display Strings to CharSequence (1/2)"
This reverts commit
b5e0084414258ff294e7d94bcf9f8492f8ab2d25.
Change-Id: I095483414f5e0076c0967b6f1955a0fe71f2b8d9
RoboErik [Mon, 21 Jul 2014 18:36:56 +0000 (18:36 +0000)]
am
81042e1e: am
cfd3f8ae: Deprecate apis that were replaced by sessions
* commit '
81042e1e957c9ac28583b4e8d92b8127cec852d5':
Deprecate apis that were replaced by sessions
RoboErik [Mon, 21 Jul 2014 18:31:37 +0000 (18:31 +0000)]
am
cfd3f8ae: Deprecate apis that were replaced by sessions
* commit '
cfd3f8ae64f7d91246689b96524aac1922758c84':
Deprecate apis that were replaced by sessions
RoboErik [Fri, 18 Jul 2014 18:30:55 +0000 (11:30 -0700)]
Deprecate apis that were replaced by sessions
These classes all have new components in the session APIs.
bug:
16218444
Change-Id: Ib64ff0e23503e4c9eb2fd9162a878e1eaba7c4df
destradaa [Mon, 21 Jul 2014 18:25:44 +0000 (18:25 +0000)]
am
a4d0d8c2: am
77e1c1a5: Merge "Update GPS HAL raw measurements support." into lmp-dev
* commit '
a4d0d8c29e68ee4f9bf28399b344ee72eb492baa':
Update GPS HAL raw measurements support.
destradaa [Mon, 21 Jul 2014 18:21:36 +0000 (18:21 +0000)]
am
77e1c1a5: Merge "Update GPS HAL raw measurements support." into lmp-dev
* commit '
77e1c1a5e6206ffca7b26dabc167f28c7e1d7d18':
Update GPS HAL raw measurements support.
Adam Powell [Mon, 21 Jul 2014 18:17:53 +0000 (18:17 +0000)]
am
2b0d3fc7: am
dd896d93: Merge "Sort ResolverActivity items based on UsageStats" into lmp-dev
* commit '
2b0d3fc764bf9544dd1a2bc77dd31661c07b8328':
Sort ResolverActivity items based on UsageStats
Santos Cordon [Mon, 21 Jul 2014 18:17:48 +0000 (18:17 +0000)]
am
1557474e: am
b5e00844: Change display Strings to CharSequence (1/2)
* commit '
1557474e79aeac6ff2cb50517799c9086a6a1a89':
Change display Strings to CharSequence (1/2)
Adam Powell [Mon, 21 Jul 2014 18:14:02 +0000 (18:14 +0000)]
am
dd896d93: Merge "Sort ResolverActivity items based on UsageStats" into lmp-dev
* commit '
dd896d93fe6433385dcd47fc7e165a9f894c9e52':
Sort ResolverActivity items based on UsageStats
Santos Cordon [Mon, 21 Jul 2014 18:09:57 +0000 (18:09 +0000)]
am
b5e00844: Change display Strings to CharSequence (1/2)
* commit '
b5e0084414258ff294e7d94bcf9f8492f8ab2d25':
Change display Strings to CharSequence (1/2)
Andrew Solovay [Mon, 21 Jul 2014 18:05:56 +0000 (18:05 +0000)]
am
469db690: am
cf300d2f: am
30aa5924: am
643fa8d1: Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev
* commit '
469db690192468ff22cc46c4ce8b866e69ebf252':
docs: Noted how singleTop affects "up" navigation.
Santos Cordon [Mon, 21 Jul 2014 07:00:44 +0000 (00:00 -0700)]
Change display Strings to CharSequence (1/2)
Bug:
16416927
Change-Id: I81cd3572f3931cd97611621a1db12bea165bda56
Andrew Solovay [Mon, 21 Jul 2014 18:01:43 +0000 (18:01 +0000)]
am
cf300d2f: am
30aa5924: am
643fa8d1: Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev
* commit '
cf300d2f0e6320e530a26c7adeaf1dbd27c694e4':
docs: Noted how singleTop affects "up" navigation.
Jean-Michel Trivi [Mon, 21 Jul 2014 18:00:03 +0000 (18:00 +0000)]
am
61734857: am
61b79634: Merge "AudioAttributes for SoundPool" into lmp-dev
* commit '
617348571e4af946e72d2867a3cbb590e01561d9':
AudioAttributes for SoundPool
Andrew Solovay [Mon, 21 Jul 2014 17:53:30 +0000 (17:53 +0000)]
am
30aa5924: am
643fa8d1: Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev
* commit '
30aa5924f0a372a10c7245a16ee460359826ab9c':
docs: Noted how singleTop affects "up" navigation.
Jean-Michel Trivi [Mon, 21 Jul 2014 17:53:26 +0000 (17:53 +0000)]
am
61b79634: Merge "AudioAttributes for SoundPool" into lmp-dev
* commit '
61b79634d4cfae4448af6a512cb66488467274de':
AudioAttributes for SoundPool
Deepanshu Gupta [Mon, 21 Jul 2014 17:51:14 +0000 (17:51 +0000)]
am
db2a5ff1: am
78d85419: Fix missing initial moveto in path definition.
* commit '
db2a5ff129bca5eec42fe800d06fd02265255ddd':
Fix missing initial moveto in path definition.
Andrew Solovay [Mon, 21 Jul 2014 17:47:13 +0000 (17:47 +0000)]
am
643fa8d1: Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev
* commit '
643fa8d1ecf5d2a485b7b30d43a47d090b5e3dcc':
docs: Noted how singleTop affects "up" navigation.
Deepanshu Gupta [Mon, 21 Jul 2014 17:44:47 +0000 (17:44 +0000)]
am
78d85419: Fix missing initial moveto in path definition.
* commit '
78d8541976f31a018ace165b0e95bab81a136bb3':
Fix missing initial moveto in path definition.
Deepanshu Gupta [Thu, 17 Jul 2014 16:33:04 +0000 (09:33 -0700)]
Fix missing initial moveto in path definition.
The Path_Delegate was missing a moveTo call which resulted in
IllegalPathStateException when rendering the ProgressBar.
Change-Id: Ibdae5f90ffd0a71a3de4ba945238239faa0b18b2
Craig Mautner [Mon, 21 Jul 2014 17:36:04 +0000 (17:36 +0000)]
am
28d5d4df: am
52cf4df1: Merge "Rename flag and attribute per API council" into lmp-dev
* commit '
28d5d4df0db89ae40ebd83c9973b7583522e5f1c':
Rename flag and attribute per API council
Craig Mautner [Mon, 21 Jul 2014 17:31:55 +0000 (17:31 +0000)]
am
52cf4df1: Merge "Rename flag and attribute per API council" into lmp-dev
* commit '
52cf4df1c333232977b323fd6b0d5f41f3a135eb':
Rename flag and attribute per API council
Ricardo Cervera [Mon, 21 Jul 2014 17:24:41 +0000 (17:24 +0000)]
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 '
2f08e6ea7873944e9a647c84ded3d66503ac0c1f':
docs: Added note suggesting use of Android Studio over ADT
Ricardo Cervera [Mon, 21 Jul 2014 17:20:18 +0000 (17:20 +0000)]
am
f47dab8b: am
fef00111: am
d73eb7f9: am
940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs
* commit '
f47dab8b86224debcebe27b84d4a84b165c9b3eb':
docs: Added note suggesting use of Android Studio over ADT
Ricardo Cervera [Mon, 21 Jul 2014 17:15:09 +0000 (17:15 +0000)]
am
fef00111: am
d73eb7f9: am
940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs
* commit '
fef0011144e2223df382abae412f145c5ea41548':
docs: Added note suggesting use of Android Studio over ADT
Ricardo Cervera [Mon, 21 Jul 2014 17:11:42 +0000 (17:11 +0000)]
am
d73eb7f9: am
940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs
* commit '
d73eb7f9c96c2211ab12a09c319978915cf593bf':
docs: Added note suggesting use of Android Studio over ADT
Ricardo Cervera [Mon, 21 Jul 2014 17:07:00 +0000 (17:07 +0000)]
am
940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs
* commit '
940ae93043a7d36d89ab777cbc691893590d326c':
docs: Added note suggesting use of Android Studio over ADT
Derek Sollenberger [Mon, 21 Jul 2014 17:05:30 +0000 (17:05 +0000)]
am
9a27e8f2: am
1bf087a9: Merge "Remove invalid SkASSERT that prevents us from running with SK_DEBUG" into lmp-dev
* commit '
9a27e8f2915f1f367d24fbb0455f7e5b873d74d2':
Remove invalid SkASSERT that prevents us from running with SK_DEBUG
Yorke Lee [Mon, 21 Jul 2014 17:05:27 +0000 (17:05 +0000)]
am
b9105f15: am
ec0197da: Merge "Add call log entries to all currently running users" into lmp-dev
* commit '
b9105f15aa914fcbc10cf414edf2a79ab23c403c':
Add call log entries to all currently running users
Derek Sollenberger [Mon, 21 Jul 2014 17:01:19 +0000 (17:01 +0000)]
am
1bf087a9: Merge "Remove invalid SkASSERT that prevents us from running with SK_DEBUG" into lmp-dev
* commit '
1bf087a904aaa7b4fbd7302600f1cbd98e540855':
Remove invalid SkASSERT that prevents us from running with SK_DEBUG
Yorke Lee [Mon, 21 Jul 2014 17:01:15 +0000 (17:01 +0000)]
am
ec0197da: Merge "Add call log entries to all currently running users" into lmp-dev
* commit '
ec0197dae050d48b803b803b082d619925306fc0':
Add call log entries to all currently running users
Derek Sollenberger [Mon, 21 Jul 2014 16:49:23 +0000 (16:49 +0000)]
am
61cc70a2: am
521830a7: Merge "Separate Canvas JNI code from the implementation." into lmp-dev
* commit '
61cc70a2c21e32c6e6d0f0c909c85bf8b1095d3e':
Separate Canvas JNI code from the implementation.
Derek Sollenberger [Mon, 21 Jul 2014 16:45:15 +0000 (16:45 +0000)]
am
521830a7: Merge "Separate Canvas JNI code from the implementation." into lmp-dev
* commit '
521830a79ba1e56429b31607a4c5af990cd76542':
Separate Canvas JNI code from the implementation.
Robert Ly [Mon, 21 Jul 2014 16:30:06 +0000 (16:30 +0000)]
am
d93a4d1b: am
077d5622: am
205196f1: am
efca30d0: am
62c81ab5: docs: change copy for edu video
* commit '
d93a4d1bae3713a518b3b3bc7ddcfe4f22b8994c':
docs: change copy for edu video
Robert Ly [Mon, 21 Jul 2014 16:26:43 +0000 (16:26 +0000)]
am
077d5622: am
205196f1: am
efca30d0: am
62c81ab5: docs: change copy for edu video
* commit '
077d56225b53ef152474e0aed27fe4010139fe01':
docs: change copy for edu video
Robert Ly [Mon, 21 Jul 2014 16:22:12 +0000 (16:22 +0000)]
am
205196f1: am
efca30d0: am
62c81ab5: docs: change copy for edu video
* commit '
205196f128b13eecea2789506341c7ecd2044b71':
docs: change copy for edu video
Robert Ly [Mon, 21 Jul 2014 16:17:39 +0000 (16:17 +0000)]
am
efca30d0: am
62c81ab5: docs: change copy for edu video
* commit '
efca30d0fafefb9f59668ee9d918cd7cc6098e6c':
docs: change copy for edu video
Robert Ly [Mon, 21 Jul 2014 16:11:39 +0000 (16:11 +0000)]
am
62c81ab5: docs: change copy for edu video
* commit '
62c81ab580ec39635fc8b52f552872675c87a816':
docs: change copy for edu video
Adrian Roos [Mon, 21 Jul 2014 16:09:27 +0000 (16:09 +0000)]
am
4f5106e7: am
c1c28902: More user switching goodness
* commit '
4f5106e7a69d2c4893e7b7492948ab377682a8be':
More user switching goodness
Robert Ly [Mon, 21 Jul 2014 16:06:50 +0000 (09:06 -0700)]
docs: change copy for edu video
Change-Id: I88e5ae8e9c0f899f0e4dfc5087de9ea18153894d
Adrian Roos [Mon, 21 Jul 2014 16:04:49 +0000 (16:04 +0000)]
am
c1c28902: More user switching goodness
* commit '
c1c28902038844c608d06692df74b2886d41fc6f':
More user switching goodness
Adrian Roos [Thu, 17 Jul 2014 21:35:18 +0000 (23:35 +0200)]
More user switching goodness
- Confirmation when exiting guest
- Dialog when resuming existing guest session (will be HUNed in follow-up CL)
- Properly center user name in QS user switcher
Bug:
15759638
Bug:
16378966
Change-Id: I63a1dd524975408618c10d90a18052f15deec756
Adam Lesinski [Mon, 21 Jul 2014 23:13:54 +0000 (23:13 +0000)]
Merge "Change UsageStatsService to check uses-permission" into lmp-dev
Adam Lesinski [Mon, 21 Jul 2014 18:27:58 +0000 (11:27 -0700)]
Change UsageStatsService to check uses-permission
Have UsageStatsService check permission grants when AppOps
returns the default MODE_IGNORED mode for a package.
Change-Id: I784a708451a56863b13fc5f178e10bba6ce37a2f
Ricardo Cervera [Mon, 21 Jul 2014 17:04:09 +0000 (17:04 +0000)]
Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs
Ricardo Cervera [Wed, 16 Jul 2014 16:33:39 +0000 (09:33 -0700)]
docs: Added note suggesting use of Android Studio over ADT
Change-Id: Id921c06ea75c70e1ad4741c743f1d15958686b16
Jean-Michel Trivi [Mon, 21 Jul 2014 23:59:40 +0000 (23:59 +0000)]
Merge "New MediaFormat keys for AAC" into lmp-dev
Jean-Michel Trivi [Mon, 21 Jul 2014 17:48:52 +0000 (10:48 -0700)]
New MediaFormat keys for AAC
Decoder:
KEY_AAC_DRC_ATTENUATION_FACTOR
KEY_AAC_DRC_BOOST_FACTOR
KEY_AAC_DRC_HEAVY_COMPRESSION
KEY_AAC_DRC_TARGET_REFERENCE_LEVEL
KEY_AAC_ENCODED_TARGET_LEVEL
KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT
Encoder:
KEY_AAC_SBR_MODE
Change-Id: I69abe01add135875446914134d93a58815992e07
Alan Viverette [Mon, 21 Jul 2014 21:55:26 +0000 (21:55 +0000)]
Merge "Always apply surface insets" into lmp-dev
Alan Viverette [Mon, 21 Jul 2014 19:10:30 +0000 (12:10 -0700)]
Always apply surface insets
Change-Id: I9d8ad0c7fcf7a1016e01c2332f45614da5d2cf0c
Craig Mautner [Mon, 21 Jul 2014 21:35:15 +0000 (21:35 +0000)]
Merge "Don't create a delegate for null callbacks." into lmp-dev
Craig Mautner [Mon, 21 Jul 2014 21:18:29 +0000 (14:18 -0700)]
Don't create a delegate for null callbacks.
ActivityView does not create callbacks for the VirtualDisplay. This
leads to setting Looper.myLooper() from a Binder thread which
leads to NPE when trying to dereference its message queue.
Fixes bug
16386002.
Change-Id: I12760a22075ed4770f3fe960763e0135fe095cfe
destradaa [Mon, 21 Jul 2014 18:17:49 +0000 (18:17 +0000)]
Merge "Update GPS HAL raw measurements support." into lmp-dev
destradaa [Sat, 19 Jul 2014 00:50:24 +0000 (17:50 -0700)]
Update GPS HAL raw measurements support.
Align the GPS framework with the GPS HAL
b/
16374800
Remove localTime field from API
b/
16241708
Update Property containers for measurements to use bit masks
b/
16238371
Change-Id: Id4db16c3153d0020bf2edb5a67f59353662762d0