Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
200,003 Commits 3 Branches 0 Tags
aa03c441e374633c24abfe63a9f1118968a4be46
Commit Graph

200003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Quddus Chong
aa03c441e3 am 6efa47fd: am 19cecd51: am a5de0f30: am cdc28652: Merge "docs: Updated Recommending TV Content lesson to support card customization. bug: 21787002" into mnc-preview-docs 
* commit '6efa47fd3043385caefeb09886ba0576735045c8':
  docs: Updated Recommending TV Content lesson to support card customization. bug: 21787002
 2015-06-20 00:29:52 +00:00
Quddus Chong
6efa47fd30 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
 2015-06-20 00:16:03 +00:00
Adrian Roos
b71bbc1650 am daa2c922: am b2522511: Merge "Tweak assist disclosure animation" into mnc-dev 
* commit 'daa2c922e1e310c427d36132ac1a9e67d710e10b':
  Tweak assist disclosure animation
 2015-06-20 00:10:26 +00:00
Robert Shih
6ad1fb7757 am 3064e8d5: am 1b98ab33: Merge "MediaPlayer: documentation for error/info codes." into mnc-dev 
* commit '3064e8d53b1860abd79ae8a78bfd9d6cd61080e5':
  MediaPlayer: documentation for error/info codes.
 2015-06-20 00:10:22 +00:00
Junda Liu
a8d3177fb7 am c4bef48a: am 8f87c824: Merge "Fix spelling of a config variable." into mnc-dev 
* commit 'c4bef48a90547716fd357b96a1cd553c8914528d':
  Fix spelling of a config variable.
 2015-06-20 00:10:17 +00:00
Christopher Ferris
7493793b2c am d9f60741: am bf30b4fd: Merge "Add libwilhelm to app_process." into mnc-dev 
* commit 'd9f607417206552ecf48ba7a7f449321031619a7':
  Add libwilhelm to app_process.
 2015-06-20 00:10:11 +00:00
Svetoslav
635ace0729 am 3adcfab7: am 2fbe248c: Merge "Grant default permissions if perms reset on upgrade." into mnc-dev 
* commit '3adcfab7e91e2319e20dc0cafbaefece536b0989':
  Grant default permissions if perms reset on upgrade.
 2015-06-20 00:10:07 +00:00
Filip Gruszczynski
49bcd753bf am 78a74632: am a51f8b90: am 73187e57: am dd91362c: Make sure home activity gets resumed after started. 
* commit '78a74632b8d5ce2a87897d6a676a2f922349bb23':
  Make sure home activity gets resumed after started.
 2015-06-20 00:10:03 +00:00
Quddus Chong
19cecd51f9 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
 2015-06-20 00:02:55 +00:00
Adrian Roos
daa2c922e1 am b2522511: Merge "Tweak assist disclosure animation" into mnc-dev 
* commit 'b252251144388856a390c9ace912e1cb4ecdaa51':
  Tweak assist disclosure animation
 2015-06-19 23:57:28 +00:00
Robert Shih
3064e8d53b am 1b98ab33: Merge "MediaPlayer: documentation for error/info codes." into mnc-dev 
* commit '1b98ab33281f0000ac3f1c12e9cb2b4dfb0a2bb6':
  MediaPlayer: documentation for error/info codes.
 2015-06-19 23:57:24 +00:00
Junda Liu
c4bef48a90 am 8f87c824: Merge "Fix spelling of a config variable." into mnc-dev 
* commit '8f87c8249b33feff0ac414576b90e5c70b5661be':
  Fix spelling of a config variable.
 2015-06-19 23:57:19 +00:00
Christopher Ferris
d9f6074172 am bf30b4fd: Merge "Add libwilhelm to app_process." into mnc-dev 
* commit 'bf30b4fd92496cb0d66053ce777f29b4a07494b2':
  Add libwilhelm to app_process.
 2015-06-19 23:57:15 +00:00
Svetoslav
3adcfab7e9 am 2fbe248c: Merge "Grant default permissions if perms reset on upgrade." into mnc-dev 
* commit '2fbe248c155a716d0345f683963aef7c95cc02b6':
  Grant default permissions if perms reset on upgrade.
 2015-06-19 23:57:11 +00:00
Filip Gruszczynski
78a74632b8 am a51f8b90: am 73187e57: am dd91362c: Make sure home activity gets resumed after started. 
* commit 'a51f8b90f53acbd8967755a39096705704980d05':
  Make sure home activity gets resumed after started.
 2015-06-19 23:57:06 +00:00
Adrian Roos
b252251144 Merge "Tweak assist disclosure animation" into mnc-dev 2015-06-19 23:51:35 +00:00
Robert Shih
1b98ab3328 Merge "MediaPlayer: documentation for error/info codes." into mnc-dev 2015-06-19 23:49:55 +00:00
Quddus Chong
a5de0f30cf 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
 2015-06-19 23:49:11 +00:00
Junda Liu
8f87c8249b Merge "Fix spelling of a config variable." into mnc-dev 2015-06-19 23:49:07 +00:00
Adrian Roos
c6d3e0e11d Tweak assist disclosure animation 
Bug: 21568059
Change-Id: I81666bed4d4ae3eb1998cfdcc652921bafeae7f2
 2015-06-19 16:48:04 -07:00
Robert Shih
706ebb3ad7 MediaPlayer: documentation for error/info codes. 
Documented in this change:
MEDIA_ERROR_SYSTEM, and
MEDIA_INFO_NETWORK_BANDWIDTH

Bug: 18237764
Change-Id: I0e1efb5813ab0f65133d4119de7562912947c41d
 2015-06-19 16:47:58 -07:00
Christopher Ferris
bf30b4fd92 Merge "Add libwilhelm to app_process." into mnc-dev 2015-06-19 23:46:55 +00:00
Svetoslav
2fbe248c15 Merge "Grant default permissions if perms reset on upgrade." into mnc-dev 2015-06-19 23:43:11 +00:00
Svetoslav
f9f75771cc Grant default permissions if perms reset on upgrade. 
Change-Id: I371e8eb42dc8e8953a184d29cc2a3bd2c361097e
 2015-06-19 16:42:22 -07:00
Filip Gruszczynski
a51f8b90f5 am 73187e57: am dd91362c: Make sure home activity gets resumed after started. 
* commit '73187e5761063340d2092c37f5584c9b56e4a11e':
  Make sure home activity gets resumed after started.
 2015-06-19 23:42:16 +00:00
David Friedman
afb9ac99e7 am c14fa27d: 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 'c14fa27df770b23dec459e553a42155bf7645e2a':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
 2015-06-19 23:41:36 +00:00
Hyunyoung Song
64dba6159f am a0a5dc5e: 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 'a0a5dc5e652cf890b4c804f7547211d373a69022':
  Change com.android.launcher.permission.INSTALL_SHORTCUT permission to normal level https://docs.google.com/document/d/12H0b6R2tmyIoNoOs2t8PbyzlGFcbxT8OnGpRb6P6c6s/edit
 2015-06-19 23:41:32 +00:00
Quddus Chong
cdc2865260 Merge "docs: Updated Recommending TV Content lesson to support card customization. bug: 21787002" into mnc-preview-docs 2015-06-19 23:37:13 +00:00
David Friedman
c14fa27df7 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.
 2015-06-19 23:31:00 +00:00
Hyunyoung Song
a0a5dc5e65 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
 2015-06-19 23:30:56 +00:00
Alex Klyubin
ceb3b52387 am f48be6d7: am 84a378f2: Merge "Fix a bug in Android Keystore updateAAD." into mnc-dev 
* commit 'f48be6d7fa8409de355104a1846c6f30b5be65ec':
  Fix a bug in Android Keystore updateAAD.
 2015-06-19 23:30:20 +00:00
Filip Gruszczynski
73187e5761 am dd91362c: Make sure home activity gets resumed after started. 
* commit 'dd91362c2c65dbcd781034a16f293d5489946f3e':
  Make sure home activity gets resumed after started.
 2015-06-19 23:28:10 +00:00
David Friedman
8292afedfa 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.
 2015-06-19 23:14:08 +00:00
Hyunyoung Song
95499dcbb4 Merge "Change com.android.launcher.permission.INSTALL_SHORTCUT permission to normal level https://docs.google.com/document/d/12H0b6R2tmyIoNoOs2t8PbyzlGFcbxT8OnGpRb6P6c6s/edit" into mnc-dev 2015-06-19 23:07:53 +00:00
Alex Klyubin
f48be6d7fa am 84a378f2: Merge "Fix a bug in Android Keystore updateAAD." into mnc-dev 
* commit '84a378f256bf7925ceb5d2c039a033d3e59b75df':
  Fix a bug in Android Keystore updateAAD.
 2015-06-19 23:07:34 +00:00
Jonathan Basseri
1826c234bc 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
 2015-06-19 16:07:12 -07:00
David Friedman
c3fbb0ce6c 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.
 2015-06-19 23:01:02 +00:00
Alex Klyubin
84a378f256 Merge "Fix a bug in Android Keystore updateAAD." into mnc-dev 2015-06-19 22:53:21 +00:00
Alex Klyubin
ae1e0e9265 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
 2015-06-19 15:50:45 -07:00
David Friedman
bee8d60a1c 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 e62f4540cd)
 2015-06-19 22:49:40 +00:00
Svet Ganov
27479b5752 am f5da7202: am 1e575a0f: Merge "Only grant runtime permissions to special components." into mnc-dev 
* commit 'f5da72021b1855cc6b6b5819b4611152fdc968c4':
  Only grant runtime permissions to special components.
 2015-06-19 22:48:29 +00:00
Alex Klyubin
513fe2ec23 am 4fee77ff: am 53a33da9: Merge "Support more KeySpecs in Android Keystore KeyFactory." into mnc-dev 
* commit '4fee77ff9d061fc98d28061af1ace42b383fcc25':
  Support more KeySpecs in Android Keystore KeyFactory.
 2015-06-19 22:48:25 +00:00
Filip Gruszczynski
dd91362c2c 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
 2015-06-19 15:40:47 -07:00
Svet Ganov
f5da72021b am 1e575a0f: Merge "Only grant runtime permissions to special components." into mnc-dev 
* commit '1e575a0f32a00fc6a2f9a71fe1d1eb4426c71787':
  Only grant runtime permissions to special components.
 2015-06-19 22:34:39 +00:00
Alex Klyubin
4fee77ff9d am 53a33da9: Merge "Support more KeySpecs in Android Keystore KeyFactory." into mnc-dev 
* commit '53a33da9af0cb09fb154db7dbd7c25e8a9936a7f':
  Support more KeySpecs in Android Keystore KeyFactory.
 2015-06-19 22:34:34 +00:00
Amith Yamasani
5f1c2dbcfd am 97d2493f: am b94761d0: Merge "App Standby : Association between content providers and their sync adapter" into mnc-dev 
* commit '97d2493f1a737158f489f4ff9e38e5c19f798bde':
  App Standby : Association between content providers and their sync adapter
 2015-06-19 22:28:24 +00:00
Luan Nguyen
9ab0210ed3 am d61ebca9: am a36de70a: am cadd531e: am 4fdaf938: docs: Design section fixes for new templates 
* commit 'd61ebca965eb2ef46e0c649bfecf947847b73118':
  docs: Design section fixes for new templates
 2015-06-19 22:28:19 +00:00
Hyunyoung Song
8a1533ed2e Change com.android.launcher.permission.INSTALL_SHORTCUT permission to normal level 
https://docs.google.com/document/d/12H0b6R2tmyIoNoOs2t8PbyzlGFcbxT8OnGpRb6P6c6s/edit

b/21853008

Change-Id: If9c4e88fd2074de17814120d111546d6ecf58cf4
 2015-06-19 15:27:42 -07:00
Svet Ganov
1e575a0f32 Merge "Only grant runtime permissions to special components." into mnc-dev 2015-06-19 22:26:32 +00:00
Alex Klyubin
53a33da9af Merge "Support more KeySpecs in Android Keystore KeyFactory." into mnc-dev 2015-06-19 22:23:12 +00:00