OSDN Git Service
John Spurlock [Sun, 21 Jun 2015 15:33:26 +0000 (15:33 +0000)]
am
3953b5a1: Merge "Zen: Tweak total silence new user message for non-voice devices." into mnc-dev
* commit '
3953b5a1f935369b016894ed9e8cbb387fb17338':
Zen: Tweak total silence new user message for non-voice devices.
John Spurlock [Sun, 21 Jun 2015 14:52:48 +0000 (14:52 +0000)]
Merge "Zen: Tweak total silence new user message for non-voice devices." into mnc-dev
John Spurlock [Sun, 21 Jun 2015 14:46:28 +0000 (10:46 -0400)]
Zen: Tweak total silence new user message for non-voice devices.
Bug:
21953388
Change-Id: I395af64b175b22fc58d80529cdbb12ebd9e00115
Svet Ganov [Sat, 20 Jun 2015 17:44:54 +0000 (17:44 +0000)]
am
3ac465a7: Do not thrown on error persisting runtime permissions
* commit '
3ac465a7d830a973096b4f69ef4531f09dcdf07c':
Do not thrown on error persisting runtime permissions
Svet Ganov [Sat, 20 Jun 2015 17:31:25 +0000 (10:31 -0700)]
Do not thrown on error persisting runtime permissions
bug:
20752986
Change-Id: I49d7e30afd49d3dcb1bcffd2fd48e9460ed5147f
Svet Ganov [Sat, 20 Jun 2015 09:39:59 +0000 (09:39 +0000)]
am
0f800f7c: Ensure default permissions not dropped on data wipe
* commit '
0f800f7c163383ce3a49cc99bc2d8097f8961bde':
Ensure default permissions not dropped on data wipe
Svet Ganov [Sat, 20 Jun 2015 08:30:40 +0000 (01:30 -0700)]
Ensure default permissions not dropped on data wipe
bug:
21954760
Change-Id: I15de766012e66e171d2089af574687ad513a5d57
Svet Ganov [Sat, 20 Jun 2015 07:11:01 +0000 (07:11 +0000)]
am
d8e247db: Make READ_EXTERNAL_STORAGE dangerous
* commit '
d8e247db8cabe209966f4bfcb550637b45f18441':
Make READ_EXTERNAL_STORAGE dangerous
Svet Ganov [Sat, 20 Jun 2015 06:57:47 +0000 (23:57 -0700)]
Make READ_EXTERNAL_STORAGE dangerous
We have a new storage permission group that has read and
write external storage. However, read external storage is
(not a regression) a normal permission while write is a
dangerous one. This leads to cases where the user disables
the Storage permission and apps still read form it. This
change makes read external storage a dangerous permission.
bug:
21949045
Change-Id: I7e28f629dda6e9c1f70cb20a3d5bea74fb109890
Bart Sears [Sat, 20 Jun 2015 05:33:59 +0000 (05:33 +0000)]
am
950aa197: Merge "Revert "Clarify handling client certificates"" into mnc-dev
* commit '
950aa197d417bf18ddbdd7fb6fe11f990860b639':
Revert "Clarify handling client certificates"
Bart Sears [Sat, 20 Jun 2015 05:22:37 +0000 (05:22 +0000)]
Merge "Revert "Clarify handling client certificates"" into mnc-dev
Bart Sears [Sat, 20 Jun 2015 05:21:38 +0000 (05:21 +0000)]
Revert "Clarify handling client certificates"
CL broke the javadoc build.
This reverts commit
36cf701e1ef0e24ce865734babb526ef5e4dc9b4.
Change-Id: Idf8add1c7d2c205400e6657d7dc3c1b89ee238f8
Selim Cinek [Sat, 20 Jun 2015 03:34:35 +0000 (03:34 +0000)]
am
c99d9a95: Fixed content description of the lock icon when fingerprint is on
* commit '
c99d9a95643c514ee0a671f023359931df443077':
Fixed content description of the lock icon when fingerprint is on
Selim Cinek [Sat, 20 Jun 2015 01:44:50 +0000 (18:44 -0700)]
Fixed content description of the lock icon when fingerprint is on
Also surfacing Fingerprint Errors now with a message.
Bug:
21565811
Change-Id: I3bba66303c08313dbca1df5ef2f20b251f541bc1
Paul Jensen [Sat, 20 Jun 2015 01:21:20 +0000 (01:21 +0000)]
am
08d9834c: Merge "Occasionally retest for captive portals once detected" into mnc-dev
* commit '
08d9834c1bbba5f7dd284ea648e45db8a7db115b':
Occasionally retest for captive portals once detected
Paul Jensen [Sat, 20 Jun 2015 01:21:15 +0000 (01:21 +0000)]
am
422f04bc: Merge "Speed up network transition when WiFi disconnects" into mnc-dev
* commit '
422f04bc57309c34ca82746a95dda34b49b7fdf5':
Speed up network transition when WiFi disconnects
Paul Jensen [Sat, 20 Jun 2015 01:21:10 +0000 (01:21 +0000)]
am
2f56a330: Merge "Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)" into mnc-dev
* commit '
2f56a33041b95fc9badcf08e8be4fd57eec56ccb':
Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)
Paul Jensen [Sat, 20 Jun 2015 01:21:04 +0000 (01:21 +0000)]
am
8e21d29f: Merge "Don\'t send spurious onAvailable NetworkCallbacks when rematching" into mnc-dev
* commit '
8e21d29f7e8691c5798ef613c2ccc4112c649421':
Don't send spurious onAvailable NetworkCallbacks when rematching
Paul Jensen [Sat, 20 Jun 2015 01:16:19 +0000 (01:16 +0000)]
Merge "Occasionally retest for captive portals once detected" into mnc-dev
Paul Jensen [Sat, 20 Jun 2015 01:15:33 +0000 (01:15 +0000)]
Merge "Speed up network transition when WiFi disconnects" into mnc-dev
Paul Jensen [Wed, 17 Jun 2015 18:42:30 +0000 (14:42 -0400)]
Speed up network transition when WiFi disconnects
Before falling back to cellular we used to first delete all the
network routing tables and rules for WiFi. This isn't necessary
and can take significant time as it requires a lot of netd
shelling out to ip and ip[6]tables to flush routes and remove
the incoming packet mark rule. Instead have netd delete all the
network routing tables and rules after we've either fallen back
to cellular or at least kicked off a cellular connection attempt.
Bug:
21932815
Change-Id: Iabac4a8b962492682df3073cc41a12e35bc9f1bb
Paul Jensen [Sat, 20 Jun 2015 01:13:16 +0000 (01:13 +0000)]
Merge "Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)" into mnc-dev
Paul Jensen [Sat, 20 Jun 2015 01:12:18 +0000 (01:12 +0000)]
Merge "Don't send spurious onAvailable NetworkCallbacks when rematching" into mnc-dev
Adam Powell [Sat, 20 Jun 2015 00:55:34 +0000 (00:55 +0000)]
am
b3add4da: Merge "Fix regression in viewing app info from ChooserActivity targets" into mnc-dev
* commit '
b3add4dae22076d35c2c2fb9f150a69382356598':
Fix regression in viewing app info from ChooserActivity targets
Adam Powell [Sat, 20 Jun 2015 00:46:03 +0000 (00:46 +0000)]
Merge "Fix regression in viewing app info from ChooserActivity targets" into mnc-dev
Andreas Gampe [Sat, 20 Jun 2015 00:37:01 +0000 (00:37 +0000)]
am
ce49be7e: Merge "Frameworks/base: Update preloaded-classes" into mnc-dev
* commit '
ce49be7ee6cfcbf15e0e4d8975e58f6ed6916006':
Frameworks/base: Update preloaded-classes
Vinit Deshpande [Sat, 20 Jun 2015 00:36:56 +0000 (00:36 +0000)]
am
edb83227: Merge "Fix access point list jumping around in WifiSettings" into mnc-dev
* commit '
edb832271bc036975d9ff8cd1513b6a1e097f3cd':
Fix access point list jumping around in WifiSettings
Doris Liu [Sat, 20 Jun 2015 00:36:52 +0000 (00:36 +0000)]
am
4a799925: Merge "Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice" into mnc-dev
* commit '
4a79992591bd9971764b504bfe10cad656edf632':
Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice
Andreas Gampe [Sat, 20 Jun 2015 00:25:26 +0000 (00:25 +0000)]
Merge "Frameworks/base: Update preloaded-classes" into mnc-dev
Vinit Deshpande [Sat, 20 Jun 2015 00:24:31 +0000 (00:24 +0000)]
Merge "Fix access point list jumping around in WifiSettings" into mnc-dev
Doris Liu [Sat, 20 Jun 2015 00:23:24 +0000 (00:23 +0000)]
Merge "Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice" into mnc-dev
Quddus Chong [Sat, 20 Jun 2015 00:17:38 +0000 (00:17 +0000)]
am
bcca4ac4: am
0bdd3204: am
4437a129: Merge "docs: Add link from TV design page on DAC to Android TV spec on Google Design site. bug:
21786976" into mnc-preview-docs
* commit '
bcca4ac4fb4fa66f2e4196437998c08e4dbed1d3':
docs: Add link from TV design page on DAC to Android TV spec on Google Design site. bug:
21786976
Quddus Chong [Sat, 20 Jun 2015 00:17:34 +0000 (00:17 +0000)]
am
19cecd51: am
a5de0f30: am
cdc28652: Merge "docs: Updated Recommending TV Content lesson to support card customization. bug:
21787002" into mnc-preview-docs
* commit '
19cecd51f92ad16f3545eec2ab712cdc7c83b224':
docs: Updated Recommending TV Content lesson to support card customization. bug:
21787002
Quddus Chong [Sat, 20 Jun 2015 00:03:00 +0000 (00:03 +0000)]
am
0bdd3204: am
4437a129: Merge "docs: Add link from TV design page on DAC to Android TV spec on Google Design site. bug:
21786976" into mnc-preview-docs
* commit '
0bdd320402aa3406ece0afd1c89bcd00c21b3f7a':
docs: Add link from TV design page on DAC to Android TV spec on Google Design site. bug:
21786976
Quddus Chong [Sat, 20 Jun 2015 00:02:55 +0000 (00:02 +0000)]
am
a5de0f30: am
cdc28652: Merge "docs: Updated Recommending TV Content lesson to support card customization. bug:
21787002" into mnc-preview-docs
* commit '
a5de0f30cf9edfb980f5da3e8329eeb60d77057d':
docs: Updated Recommending TV Content lesson to support card customization. bug:
21787002
Adrian Roos [Fri, 19 Jun 2015 23:57:17 +0000 (23:57 +0000)]
am
b2522511: Merge "Tweak assist disclosure animation" into mnc-dev
* commit '
b252251144388856a390c9ace912e1cb4ecdaa51':
Tweak assist disclosure animation
Robert Shih [Fri, 19 Jun 2015 23:57:13 +0000 (23:57 +0000)]
am
1b98ab33: Merge "MediaPlayer: documentation for error/info codes." into mnc-dev
* commit '
1b98ab33281f0000ac3f1c12e9cb2b4dfb0a2bb6':
MediaPlayer: documentation for error/info codes.
Junda Liu [Fri, 19 Jun 2015 23:57:06 +0000 (23:57 +0000)]
am
8f87c824: Merge "Fix spelling of a config variable." into mnc-dev
* commit '
8f87c8249b33feff0ac414576b90e5c70b5661be':
Fix spelling of a config variable.
Christopher Ferris [Fri, 19 Jun 2015 23:57:02 +0000 (23:57 +0000)]
am
bf30b4fd: Merge "Add libwilhelm to app_process." into mnc-dev
* commit '
bf30b4fd92496cb0d66053ce777f29b4a07494b2':
Add libwilhelm to app_process.
Svetoslav [Fri, 19 Jun 2015 23:56:57 +0000 (23:56 +0000)]
am
2fbe248c: Merge "Grant default permissions if perms reset on upgrade." into mnc-dev
* commit '
2fbe248c155a716d0345f683963aef7c95cc02b6':
Grant default permissions if perms reset on upgrade.
Filip Gruszczynski [Fri, 19 Jun 2015 23:56:52 +0000 (23:56 +0000)]
am
a51f8b90: am
73187e57: am
dd91362c: Make sure home activity gets resumed after started.
* commit '
a51f8b90f53acbd8967755a39096705704980d05':
Make sure home activity gets resumed after started.
Adrian Roos [Fri, 19 Jun 2015 23:51:20 +0000 (23:51 +0000)]
Merge "Tweak assist disclosure animation" into mnc-dev
Robert Shih [Fri, 19 Jun 2015 23:49:44 +0000 (23:49 +0000)]
Merge "MediaPlayer: documentation for error/info codes." into mnc-dev
Quddus Chong [Fri, 19 Jun 2015 23:49:15 +0000 (23:49 +0000)]
am
4437a129: Merge "docs: Add link from TV design page on DAC to Android TV spec on Google Design site. bug:
21786976" into mnc-preview-docs
* commit '
4437a1294e26507449b48783a31b422d769af53b':
docs: Add link from TV design page on DAC to Android TV spec on Google Design site. bug:
21786976
Quddus Chong [Fri, 19 Jun 2015 23:49:11 +0000 (23:49 +0000)]
am
cdc28652: Merge "docs: Updated Recommending TV Content lesson to support card customization. bug:
21787002" into mnc-preview-docs
* commit '
cdc28652601d977bd0964d088b9070f6d2ef32d9':
docs: Updated Recommending TV Content lesson to support card customization. bug:
21787002
Junda Liu [Fri, 19 Jun 2015 23:48:57 +0000 (23:48 +0000)]
Merge "Fix spelling of a config variable." into mnc-dev
Adrian Roos [Fri, 19 Jun 2015 22:57:25 +0000 (15:57 -0700)]
Tweak assist disclosure animation
Bug:
21568059
Change-Id: I81666bed4d4ae3eb1998cfdcc652921bafeae7f2
Robert Shih [Fri, 19 Jun 2015 18:14:00 +0000 (11:14 -0700)]
MediaPlayer: documentation for error/info codes.
Documented in this change:
MEDIA_ERROR_SYSTEM, and
MEDIA_INFO_NETWORK_BANDWIDTH
Bug:
18237764
Change-Id: I0e1efb5813ab0f65133d4119de7562912947c41d
Christopher Ferris [Fri, 19 Jun 2015 23:46:53 +0000 (23:46 +0000)]
Merge "Add libwilhelm to app_process." into mnc-dev
Svetoslav [Fri, 19 Jun 2015 23:43:10 +0000 (23:43 +0000)]
Merge "Grant default permissions if perms reset on upgrade." into mnc-dev
Svetoslav [Fri, 19 Jun 2015 23:42:22 +0000 (16:42 -0700)]
Grant default permissions if perms reset on upgrade.
Change-Id: I371e8eb42dc8e8953a184d29cc2a3bd2c361097e
Filip Gruszczynski [Fri, 19 Jun 2015 23:42:16 +0000 (23:42 +0000)]
am
73187e57: am
dd91362c: Make sure home activity gets resumed after started.
* commit '
73187e5761063340d2092c37f5584c9b56e4a11e':
Make sure home activity gets resumed after started.
Quddus Chong [Fri, 19 Jun 2015 23:37:39 +0000 (23:37 +0000)]
Merge "docs: Add link from TV design page on DAC to Android TV spec on Google Design site. bug:
21786976" into mnc-preview-docs
Quddus Chong [Fri, 19 Jun 2015 23:37:10 +0000 (23:37 +0000)]
Merge "docs: Updated Recommending TV Content lesson to support card customization. bug:
21787002" into mnc-preview-docs
Doris Liu [Fri, 19 Jun 2015 22:00:24 +0000 (15:00 -0700)]
Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice
The issue states that NumberPicker.setWrapSelectorWheel(false) only works
in a specific call order. The underlying problem is that NumberPicker
does not remember user's preference on whether the selector wheel should
be wrapped. Therefore, it only works when user sets their preference last,
after everything else that could affect the choice gets executed.
Bug:
19049714
Change-Id: Ic27d909cb3dd657993a4df9a04c819b6965ad11b
Filip Gruszczynski [Fri, 19 Jun 2015 23:28:10 +0000 (23:28 +0000)]
am
dd91362c: Make sure home activity gets resumed after started.
* commit '
dd91362c2c65dbcd781034a16f293d5489946f3e':
Make sure home activity gets resumed after started.
David Friedman [Fri, 19 Jun 2015 23:27:36 +0000 (23:27 +0000)]
am
8292afed: am
c3fbb0ce: am
bee8d60a: Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
* commit '
8292afedfa7e22a6f278f8cbd5bd7b7912bf43ba':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
Hyunyoung Song [Fri, 19 Jun 2015 23:27:31 +0000 (23:27 +0000)]
am
95499dcb: Merge "Change com.android.launcher.permission.INSTALL_SHORTCUT permission to normal level https://docs.google.com/document/d/12H0b6R2tmyIoNoOs2t8PbyzlGFcbxT8OnGpRb6P6c6s/edit" into mnc-dev
* commit '
95499dcbb404d8e4d5575be7d5568115c35a639a':
Change com.android.launcher.permission.INSTALL_SHORTCUT permission to normal level https://docs.google.com/document/d/12H0b6R2tmyIoNoOs2t8PbyzlGFcbxT8OnGpRb6P6c6s/edit
David Friedman [Fri, 19 Jun 2015 23:14:08 +0000 (23:14 +0000)]
am
c3fbb0ce: am
bee8d60a: Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
* commit '
c3fbb0ce6c04ea5ece37bf4529271cb14296135b':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
Hyunyoung Song [Fri, 19 Jun 2015 23:07:51 +0000 (23:07 +0000)]
Merge "Change com.android.launcher.permission.INSTALL_SHORTCUT permission to normal level https://docs.google.com/document/d/12H0b6R2tmyIoNoOs2t8PbyzlGFcbxT8OnGpRb6P6c6s/edit" into mnc-dev
Alex Klyubin [Fri, 19 Jun 2015 23:07:44 +0000 (23:07 +0000)]
am
84a378f2: Merge "Fix a bug in Android Keystore updateAAD." into mnc-dev
* commit '
84a378f256bf7925ceb5d2c039a033d3e59b75df':
Fix a bug in Android Keystore updateAAD.
Jonathan Basseri [Fri, 19 Jun 2015 23:04:38 +0000 (16:04 -0700)]
Fix spelling of a config variable.
This is to be consistent with the style/format in CarrierConfigManager.
Fortunately, nothing in packages/apps/CarrierConfig needs to be updated,
since this variable doesn't have any overrides.
Change-Id: I8910abd28d9c0aae68a04dcfcfb2f3d0c0466ca9
David Friedman [Fri, 19 Jun 2015 23:01:02 +0000 (23:01 +0000)]
am
bee8d60a: Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
* commit '
bee8d60a1cdfb380904f8770d933e9031c7f9ff3':
Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
Alex Klyubin [Fri, 19 Jun 2015 22:53:20 +0000 (22:53 +0000)]
Merge "Fix a bug in Android Keystore updateAAD." into mnc-dev
Alex Klyubin [Fri, 19 Jun 2015 22:50:45 +0000 (15:50 -0700)]
Fix a bug in Android Keystore updateAAD.
The variant of CipherSpi.engineUpdateAAD which takes ByteBuffers
delegated to a byte[]-taking variant of superclass instead of its own
class.
Bug:
18088752
Change-Id: I3b426bbdca54bbf7f6f3939589da07b24db14d0d
David Friedman [Thu, 18 Sep 2014 01:04:23 +0000 (18:04 -0700)]
Fixes a typo where parens were used instead of curly braces, preventing
a link from being created at build time.
Change-Id: I4086ce5054cc2d5cacd72314810b626aee50df62
(cherry picked from commit
e62f4540cd6ce6289fb0196c8e30c3a3d6905794)
Filip Gruszczynski [Fri, 19 Jun 2015 22:14:53 +0000 (15:14 -0700)]
Make sure home activity gets resumed after started.
When there is only one activity and it gets paused, activity manager will
try resuming some other activity. If there is no other activity, it will
start home activity and try to resume it. This will fail, because the
activity stack doesn't want to enter recursive resuming. We need to
detect this situation and schedule additional resume of top activity
after home gets started.
Bug:
21500945
Change-Id: I6ca703f8d97bcc4001e7da4cd5a5db63bfb5c861
Svet Ganov [Fri, 19 Jun 2015 22:34:31 +0000 (22:34 +0000)]
am
1e575a0f: Merge "Only grant runtime permissions to special components." into mnc-dev
* commit '
1e575a0f32a00fc6a2f9a71fe1d1eb4426c71787':
Only grant runtime permissions to special components.
Alex Klyubin [Fri, 19 Jun 2015 22:34:25 +0000 (22:34 +0000)]
am
53a33da9: Merge "Support more KeySpecs in Android Keystore KeyFactory." into mnc-dev
* commit '
53a33da9af0cb09fb154db7dbd7c25e8a9936a7f':
Support more KeySpecs in Android Keystore KeyFactory.
Hyunyoung Song [Fri, 19 Jun 2015 22:27:42 +0000 (15:27 -0700)]
Change com.android.launcher.permission.INSTALL_SHORTCUT permission to normal level
https://docs.google.com/document/d/12H0b6R2tmyIoNoOs2t8PbyzlGFcbxT8OnGpRb6P6c6s/edit
b/
21853008
Change-Id: If9c4e88fd2074de17814120d111546d6ecf58cf4
Svet Ganov [Fri, 19 Jun 2015 22:26:30 +0000 (22:26 +0000)]
Merge "Only grant runtime permissions to special components." into mnc-dev
Alex Klyubin [Fri, 19 Jun 2015 22:23:11 +0000 (22:23 +0000)]
Merge "Support more KeySpecs in Android Keystore KeyFactory." into mnc-dev
Svet Ganov [Mon, 15 Jun 2015 23:36:24 +0000 (16:36 -0700)]
Only grant runtime permissions to special components.
Now runtime permissions are granted only to components that are
part of the system or perform special system operations. For
exmple, the shell UID gets its runtime permissions granted by
default and the default phone app gets the phone permissions
granted by default.
bug:
21764803
Change-Id: If8b8cadbd1980ffe7a6fc15bbb5f54a425f6e8f9
Amith Yamasani [Fri, 19 Jun 2015 22:16:47 +0000 (22:16 +0000)]
am
b94761d0: Merge "App Standby : Association between content providers and their sync adapter" into mnc-dev
* commit '
b94761d0a48522b23c54f786445658bb58258da4':
App Standby : Association between content providers and their sync adapter
Luan Nguyen [Fri, 19 Jun 2015 22:16:42 +0000 (22:16 +0000)]
am
a36de70a: am
cadd531e: am
4fdaf938: docs: Design section fixes for new templates
* commit '
a36de70ad4c652fd6582630a15a941a7b85cc70b':
docs: Design section fixes for new templates
Amith Yamasani [Fri, 19 Jun 2015 22:08:09 +0000 (22:08 +0000)]
Merge "App Standby : Association between content providers and their sync adapter" into mnc-dev
Amith Yamasani [Wed, 17 Jun 2015 20:25:42 +0000 (13:25 -0700)]
App Standby : Association between content providers and their sync adapter
Set sync adapters to active if the associated content providers are used
at foreground process state.
Minimize how frequently published content providers are reported by
keeping track of last reported time.
Also cache sync adapters associated with an authority in SyncManager.
Bug:
21785111
Change-Id: Ic2c8cb6a27f005d1a1d0aad21d36b1510160753a
Luan Nguyen [Fri, 19 Jun 2015 22:03:03 +0000 (22:03 +0000)]
am
cadd531e: am
4fdaf938: docs: Design section fixes for new templates
* commit '
cadd531ecf740783ee77ed5de8481a8242e4e8c8':
docs: Design section fixes for new templates
Luan Nguyen [Fri, 19 Jun 2015 21:49:59 +0000 (21:49 +0000)]
am
4fdaf938: docs: Design section fixes for new templates
* commit '
4fdaf938ee28577324a3068b915c01deb61ade78':
docs: Design section fixes for new templates
Wale Ogunwale [Fri, 19 Jun 2015 21:36:59 +0000 (21:36 +0000)]
am
93297d20: Merge "Apply the scale to surfaceinsets when computing crop region" into mnc-dev
* commit '
93297d20865b1548d4405c22bf0c7f94140b43c9':
Apply the scale to surfaceinsets when computing crop region
Miao Wang [Fri, 19 Jun 2015 21:36:55 +0000 (21:36 +0000)]
am
df584d34: Merge "[RenderScript] Add documentation for IntrinsicBLAS, and @hide annotations." into mnc-dev
* commit '
df584d34b5c58cdb59c7be3cc7d58333c74588f2':
[RenderScript] Add documentation for IntrinsicBLAS, and @hide annotations.
Wale Ogunwale [Fri, 19 Jun 2015 21:32:13 +0000 (21:32 +0000)]
Merge "Apply the scale to surfaceinsets when computing crop region" into mnc-dev
Quddus Chong [Tue, 16 Jun 2015 19:09:39 +0000 (12:09 -0700)]
docs: Add link from TV design page on DAC to Android TV spec on Google Design site.
bug:
21786976
Change-Id: I7bee3feaa60d5a1a35ce2c1d93b957de150e9b86
Adam Lesinski [Fri, 19 Jun 2015 21:21:58 +0000 (21:21 +0000)]
am
b6a09299: Merge "BatteryStats: Record doze wake locks" into mnc-dev
* commit '
b6a092990cd9076f860ef1d97ef50a668c3d7a5b':
BatteryStats: Record doze wake locks
Joe Fernandez [Fri, 19 Jun 2015 21:21:53 +0000 (21:21 +0000)]
am
a309f4a0: am
a8b518d7: am
041e01bb: am
003f8567: Merge "updates: build-cmdline-update" into lmp-mr1-ub-docs
* commit '
a309f4a04199e935c60b91d3ac9565cbbee600ee':
updates: build-cmdline-update
Miao Wang [Fri, 19 Jun 2015 21:19:54 +0000 (21:19 +0000)]
Merge "[RenderScript] Add documentation for IntrinsicBLAS, and @hide annotations." into mnc-dev
Luan Nguyen [Fri, 19 Jun 2015 21:18:18 +0000 (14:18 -0700)]
docs: Design section fixes for new templates
- Fix a number of pages in the Wear design docs
bug:
21762391
Change-Id: I26c18130cdd925d1b40f525dd209329ca2b5cd15
Adam Lesinski [Fri, 19 Jun 2015 21:13:41 +0000 (21:13 +0000)]
Merge "BatteryStats: Record doze wake locks" into mnc-dev
Adam Lesinski [Fri, 19 Jun 2015 19:02:13 +0000 (12:02 -0700)]
BatteryStats: Record doze wake locks
Doze wake locks don't actually hold the CPU awake, so we should record them
separately from full wakelocks, which is what we did before.
Bug:
21949905
Change-Id: Ib4db3399069e0ad11f1f0dc6925a87ad0ad21ff9
Joe Fernandez [Fri, 19 Jun 2015 21:08:08 +0000 (21:08 +0000)]
am
a8b518d7: am
041e01bb: am
003f8567: Merge "updates: build-cmdline-update" into lmp-mr1-ub-docs
* commit '
a8b518d7c2ca006ad52d5900ebb3ca831490d373':
updates: build-cmdline-update
Quddus Chong [Mon, 15 Jun 2015 21:06:16 +0000 (14:06 -0700)]
docs: Updated Recommending TV Content lesson to support card customization.
bug:
21787002
Change-Id: I3c94fbce2ac7efff1749b76af3da47506812972c
Joe Fernandez [Fri, 19 Jun 2015 20:59:03 +0000 (20:59 +0000)]
am
041e01bb: am
003f8567: Merge "updates: build-cmdline-update" into lmp-mr1-ub-docs
* commit '
041e01bbdffa85b9b5ffba201d36bd566eaa2651':
updates: build-cmdline-update
Yorke Lee [Fri, 19 Jun 2015 20:54:23 +0000 (20:54 +0000)]
am
c723b8d7: Merge "Don\'t save cached contact info in call log when adding call" into mnc-dev
* commit '
c723b8d74265239c8d97c0b222ccddd76e73149d':
Don't save cached contact info in call log when adding call
Alan Viverette [Fri, 19 Jun 2015 20:54:08 +0000 (20:54 +0000)]
am
ac21d5c3: Merge "Invalidate the cached ripple drawable mask if mask layer changes" into mnc-dev
* commit '
ac21d5c36e0102d9f4594b845405432f72f41838':
Invalidate the cached ripple drawable mask if mask layer changes
Yorke Lee [Fri, 19 Jun 2015 20:47:06 +0000 (20:47 +0000)]
Merge "Don't save cached contact info in call log when adding call" into mnc-dev
Joe Fernandez [Fri, 19 Jun 2015 20:45:35 +0000 (20:45 +0000)]
am
003f8567: Merge "updates: build-cmdline-update" into lmp-mr1-ub-docs
* commit '
003f8567defcb88b2e07b3f85f0b43f74d29b322':
updates: build-cmdline-update
Alan Viverette [Fri, 19 Jun 2015 20:43:18 +0000 (20:43 +0000)]
Merge "Invalidate the cached ripple drawable mask if mask layer changes" into mnc-dev
Alan Viverette [Fri, 19 Jun 2015 20:42:39 +0000 (13:42 -0700)]
Invalidate the cached ripple drawable mask if mask layer changes
Bug:
21955350
Change-Id: I2e610a5a0af39668b7e9447cfd7d48d35e11d299
Junda Liu [Fri, 19 Jun 2015 20:36:37 +0000 (20:36 +0000)]
am
5385f5a0: Merge "Add comments to carrierconfigmanager for required permission." into mnc-dev
* commit '
5385f5a0b8b22a06a3befd5b660676dc04336a5f':
Add comments to carrierconfigmanager for required permission.
Jonathan Basseri [Fri, 19 Jun 2015 20:36:32 +0000 (20:36 +0000)]
am
48fb9d15: Merge "Migrate \'csp_enabled\' to CarrierConfigManager." into mnc-dev
* commit '
48fb9d15ecaceedd5477b7b780f22b7663ca103f':
Migrate 'csp_enabled' to CarrierConfigManager.