Doris Liu
4b403557bc
Merge "Avoid setting mCurFrame to -1" into mnc-dev
2015-05-12 17:32:30 +00:00
Alex Klyubin
03064e25b2
Merge "Link to magic constants used by AndroidKeyStore API." into mnc-dev
2015-05-12 17:32:30 +00:00
Christopher Tate
54415439ca
Merge "Deprecate Context.MODE_MULTI_PROCESS" into mnc-dev
2015-05-12 17:28:28 +00:00
Craig Mautner
61e1e09a2b
Change attribute values per API council.
...
lockTaskModeDefault => default
lockTaskModeNever => never
lockTaskModeIfWhitelisted => if_whitelisted
lockTaskModeAlways => always
Fixes bug 20642190.
Change-Id: I29cc546e12c330df9ec9af3cc91faf0d0f3df3b4
2015-05-12 10:26:13 -07:00
Chris Craik
d2c05188b6
Merge "Fix build - Revert "Revert "Use default constructor to get anti-aliasing""" into mnc-dev
2015-05-12 17:22:34 +00:00
Chris Craik
7ed1431c83
Fix build - Revert "Revert "Use default constructor to get anti-aliasing""
...
This reverts commit dfe0a66ceca530e0777ebfab20f81103baa18f14.
Change-Id: I58a1bae649a284f3d3b6213064d903ea7fcf185a
2015-05-12 17:22:22 +00:00
Rich Slogar
b97afd4185
am a27dd186: am e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs
...
* commit 'a27dd186b265b58eae490d4e19ec11268ea54f12':
docs: renderscript using gradle settings
2015-05-12 17:20:10 +00:00
Alex Klyubin
15a7bb202d
Merge "Move PointFormat constants into parent class." into mnc-dev
2015-05-12 17:12:18 +00:00
Alex Klyubin
1af25508d6
Move PointFormat constants into parent class.
...
This gets rid of EcIesParameterSpec.PointFormat by moving the
constants into EcIesParameterSpec, prefixed with POINT_FORMAT_.
Bug: 21039983
Change-Id: I7a76bb84e0394db9c7f5b0d53526915d5bbdd511
2015-05-12 10:09:00 -07:00
Doris Liu
56ef127df7
Avoid setting mCurFrame to -1
...
Use the dedicated flag mRunning to check whether the DrawableAnimation
is running, rather than comparing mCurFrame with -1. This CL aims to
simplify the use of mCurFrame.
Bug: 17112962
Change-Id: I15f9e4c102f504b8c806f029949fe9ec872479a5
2015-05-12 10:07:25 -07:00
Chris Craik
fd41cf0cfc
Merge "Revert "Use default constructor to get anti-aliasing"" into mnc-dev
2015-05-12 17:07:25 +00:00
Rich Slogar
a27dd186b2
am e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs
...
* commit 'e78f136b1dbe11dc98c5699da24df49fd9dae795':
docs: renderscript using gradle settings
2015-05-12 17:05:40 +00:00
Alex Klyubin
56b96da7e1
Merge "Hide @IntDef and @StringDef annotations from AnroidKeyStore API." into mnc-dev
2015-05-12 16:56:15 +00:00
Rich Slogar
e78f136b1d
Merge "docs: renderscript using gradle settings" into lmp-docs
2015-05-12 16:54:39 +00:00
Olawale Ogunwale
3d8c678136
Merge "Don't apply animation clip to dialog activities" into mnc-dev
2015-05-12 16:51:03 +00:00
Chris Craik
dc9230b14e
Merge "Shrink default path cache size" into mnc-dev
2015-05-12 16:39:34 +00:00
Chris Craik
dfe0a66cec
Revert "Use default constructor to get anti-aliasing"
...
bug:20948129
This reverts commit 58fc522a69e8ddf9ac8530ce88e9c2c92da1dd14.
Change-Id: Iddeccb4ad15b843bb3e610bd3673a0c7abc1bf46
2015-05-12 16:36:49 +00:00
Paul Jensen
356a26122b
Merge "Deprecate ConnectivityManager.isNetworkTypeValid as it's unneeded." into mnc-dev
2015-05-12 16:32:29 +00:00
Alex Klyubin
dddd6f73a9
Hide @IntDef and @StringDef annotations from AnroidKeyStore API.
...
By convention, these annotation classes should remain hidden API.
Bug: 18088752
Bug: 21039983
Change-Id: Ifb5d2910c7dae4e0fd809876eb641f1aaf7a00a6
2015-05-12 09:29:56 -07:00
Christopher Tate
c7374318a6
am 7a4cfa58: am 960cb481: am 613626b7: am afd883f8: During early boot, send LOCALE_CHANGED only to registered receivers
...
* commit '7a4cfa58b1421f95266acc4f6a1683804726a0e0':
During early boot, send LOCALE_CHANGED only to registered receivers
2015-05-12 16:17:47 +00:00
Christopher Tate
7a4cfa58b1
am 960cb481: am 613626b7: am afd883f8: During early boot, send LOCALE_CHANGED only to registered receivers
...
* commit '960cb4816c082eee52a221052a8e4232f0c0fb14':
During early boot, send LOCALE_CHANGED only to registered receivers
2015-05-12 16:06:43 +00:00
Andre Eisenbach
14dcb5f138
Bluetooth native dumpsys logging support (3/5)
...
Bug: 18508263
Change-Id: I88f9c90dab8b0c825010c8617709449a3dd704b2
2015-05-12 15:56:39 +00:00
Christopher Tate
960cb4816c
am 613626b7: am afd883f8: During early boot, send LOCALE_CHANGED only to registered receivers
...
* commit '613626b7488c5c35a4816804fbe8f837a7e30440':
During early boot, send LOCALE_CHANGED only to registered receivers
2015-05-12 15:53:04 +00:00
Chris Craik
bf9c5c13cd
Merge "Remove usage of Texture::cleanup in PathCache" into mnc-dev
2015-05-12 15:48:55 +00:00
Christopher Tate
613626b748
am afd883f8: During early boot, send LOCALE_CHANGED only to registered receivers
...
* commit 'afd883f8a3ee260a5505f83d628c0b789871c837':
During early boot, send LOCALE_CHANGED only to registered receivers
2015-05-12 15:39:12 +00:00
Jason Monk
e74d5d09e1
Merge "Add SysUI Tuner" into mnc-dev
2015-05-12 15:03:44 +00:00
Jason Monk
295a337781
Add SysUI Tuner
...
Change-Id: I9b0fabbe913b8297d8c668b6416a7be856adb9d5
2015-05-12 11:01:02 -04:00
Paul Jensen
9e59e12b86
Deprecate ConnectivityManager.isNetworkTypeValid as it's unneeded.
...
All ConnectivityManager APIs taking a network type have been
deprecated so there should be no need to validate a network type.
bug:20647016
Change-Id: I2dcf24f58016e94aa814dda38cfc848366cc461c
2015-05-12 10:36:56 -04:00
Jason Monk
2df11817b2
Merge "Add control for double tap to wake setting" into mnc-dev
2015-05-12 14:35:15 +00:00
John Reck
4bd4121d58
Merge "Increase HISTORY_SIZE for GraphicsStatsService" into mnc-dev
2015-05-12 14:21:39 +00:00
Jason Monk
27bbb2d0a1
Add control for double tap to wake setting
...
Bug: 16875464
Change-Id: Ic1ad910dd38acbc68ef040b2acdf3696ec2c2e4e
2015-05-12 10:12:32 -04:00
Amith Yamasani
bb9d9278aa
Merge "Idle timebase" into mnc-dev
2015-05-12 13:04:31 +00:00
Michael Wright
6959865fb0
Merge "Remove SLEEP and POWER from wake key list." into mnc-dev
2015-05-12 12:12:50 +00:00
Narayan Kamath
5a7587fa90
Fix file descriptor leak when opening invalid archives.
...
I've inspected all other callers of OpenArchive and this seems
to be the only broken one. The easiest way to reproduce this is
by using getPackageArchiveInfo or by adding an asset path that
isn't a valid APK.
bug: https://code.google.com/p/android/issues/detail?id=171099
Change-Id: I41cd85d20f26ad47968e2a6f1384cc03330b558b
2015-05-12 10:37:18 +00:00
Ricky Wai
227d42db5b
Merge "Fix LauncherActivityInfo.getBadgedIcon() cannot get high density icon" into mnc-dev
2015-05-12 09:36:02 +00:00
Rubin Xu
9fc8bb63d8
Merge "Tweak SystemUpdatePolicy according to API review." into mnc-dev
2015-05-12 09:06:14 +00:00
Clara Bayarri
c12e4e468f
Merge "Fix Floating toolbar is not refreshed when dragging insertion handle" into mnc-dev
2015-05-12 09:06:06 +00:00
Jae Seo
8ef4a3c9c0
Merge "TIF: Rename requestUnblockContent to unblockContent" into mnc-dev
2015-05-12 05:21:27 +00:00
Jae Seo
a90338396c
TIF: Rename requestUnblockContent to unblockContent
...
The method TvView.requestUnblockContent doesn't match the name of the
corresponding method in TvInputService, onUnblockContent, hence changed
the name to make it consistent with the current naming scheme.
This change deprecated the requestUnblockContent method as the first
step.
Bug: 19337627
Change-Id: I530209c4dca66305da90ffded7199fa3c1c1780c
2015-05-11 22:14:04 -07:00
Dongwon Kang
b9e26621ba
Merge "TIF: add more documentation on Session.setOverlayViewEnabled()." into mnc-dev
2015-05-12 04:51:09 +00:00
Jae Seo
cf1b4c77de
Merge "TIF: Unhide the surface layout API" into mnc-dev
2015-05-12 04:43:07 +00:00
Jae Seo
606c8a3965
TIF: Unhide the surface layout API
...
Also fixed some comments to make them more consistent with now public
API.
Bug: 20254168
Change-Id: I62fcdace742603ffd3756c5188c8cf37ccf964ba
2015-05-11 21:25:10 -07:00
Joe Fernandez
57881dcfb1
am f3c04204: am 13e39e3f: am c1e97347: Merge "docs: studio 1.2.1.1 updates" into lmp-mr1-ub-docs
...
* commit 'f3c042045f70b74d700c3d96429f45b93606e56b':
docs: studio 1.2.1.1 updates
2015-05-12 04:24:53 +00:00
Jeff Hao
bff523940f
am 3da32f77: am b1e9430a: am c5ced5d3: Fix prototype for startMethodTracingSampling in profiling docs.
...
* commit '3da32f77fb99a21c35cfc914641e34b949c2d623':
Fix prototype for startMethodTracingSampling in profiling docs.
2015-05-12 04:24:46 +00:00
Jinsuk Kim
e6e8f3d589
CEC: Let playback device send <Standby> upon power off
...
Let playback device send a command <Standby> based on the setting.
ACTION_SHUTDOWN leads to broadcast command to put all the devices
to sleep, and ACTION_SCREEN_OFF optionally turns off TV only.
Change-Id: Id458b23ce86b0c3179efa21cce85b721a47001be
2015-05-12 13:22:12 +09:00
Joe Fernandez
f3c042045f
am 13e39e3f: am c1e97347: Merge "docs: studio 1.2.1.1 updates" into lmp-mr1-ub-docs
...
* commit '13e39e3fd28544ff13639938455a8b7d593b835b':
docs: studio 1.2.1.1 updates
2015-05-12 04:09:42 +00:00
Jeff Hao
3da32f77fb
am b1e9430a: am c5ced5d3: Fix prototype for startMethodTracingSampling in profiling docs.
...
* commit 'b1e9430a9d653937ae9ee2ae9c3e60860b30ba4d':
Fix prototype for startMethodTracingSampling in profiling docs.
2015-05-12 04:09:38 +00:00
Joe Fernandez
13e39e3fd2
am c1e97347: Merge "docs: studio 1.2.1.1 updates" into lmp-mr1-ub-docs
...
* commit 'c1e973477d635e08ab656bba3dbaf73927feaae8':
docs: studio 1.2.1.1 updates
2015-05-12 04:00:31 +00:00
Jeff Hao
b1e9430a9d
am c5ced5d3: Fix prototype for startMethodTracingSampling in profiling docs.
...
* commit 'c5ced5d354678c6eaefbfab11035b4f05361264a':
Fix prototype for startMethodTracingSampling in profiling docs.
2015-05-12 04:00:24 +00:00
Joe Fernandez
c1e973477d
Merge "docs: studio 1.2.1.1 updates" into lmp-mr1-ub-docs
2015-05-12 03:51:24 +00:00