Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
197,644 Commits 3 Branches 0 Tags
c4bef48a90547716fd357b96a1cd553c8914528d
Commit Graph

197644 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Junda Liu
8f87c8249b Merge "Fix spelling of a config variable." into mnc-dev 2015-06-19 23:49:07 +00: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
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
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
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
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
Svet Ganov
adc1cf4604 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
 2015-06-19 15:17:56 -07:00
Amith Yamasani
97d2493f1a 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
 2015-06-19 22:15:31 +00:00
Luan Nguyen
d61ebca965 am a36de70a: am cadd531e: am 4fdaf938: docs: Design section fixes for new templates 
* commit 'a36de70ad4c652fd6582630a15a941a7b85cc70b':
  docs: Design section fixes for new templates
 2015-06-19 22:15:27 +00:00
Amith Yamasani
b94761d0a4 Merge "App Standby : Association between content providers and their sync adapter" into mnc-dev 2015-06-19 22:08:13 +00:00
Amith Yamasani
37a40c24de 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
 2015-06-19 15:04:58 -07:00
Luan Nguyen
a36de70ad4 am cadd531e: am 4fdaf938: docs: Design section fixes for new templates 
* commit 'cadd531ecf740783ee77ed5de8481a8242e4e8c8':
  docs: Design section fixes for new templates
 2015-06-19 22:03:03 +00:00
Luan Nguyen
cadd531ecf am 4fdaf938: docs: Design section fixes for new templates 
* commit '4fdaf938ee28577324a3068b915c01deb61ade78':
  docs: Design section fixes for new templates
 2015-06-19 21:49:59 +00:00
Wale Ogunwale
db33863e52 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
 2015-06-19 21:36:30 +00:00
Miao Wang
1fff1371b3 am df584d34: Merge "[RenderScript] Add documentation for IntrinsicBLAS, and @hide annotations." into mnc-dev 
* commit 'df584d34b5c58cdb59c7be3cc7d58333c74588f2':
  [RenderScript] Add documentation for IntrinsicBLAS, and @hide annotations.
 2015-06-19 21:36:25 +00:00
Wale Ogunwale
93297d2086 Merge "Apply the scale to surfaceinsets when computing crop region" into mnc-dev 2015-06-19 21:32:15 +00:00
Adam Lesinski
bd9b25efb8 am b6a09299: Merge "BatteryStats: Record doze wake locks" into mnc-dev 
* commit 'b6a092990cd9076f860ef1d97ef50a668c3d7a5b':
  BatteryStats: Record doze wake locks
 2015-06-19 21:25:41 +00:00
Joe Fernandez
2f94d22051 am a309f4a0: am a8b518d7: am 041e01bb: am 003f8567: Merge "updates: build-cmdline-update" into lmp-mr1-ub-docs 
* commit 'a309f4a04199e935c60b91d3ac9565cbbee600ee':
  updates: build-cmdline-update
 2015-06-19 21:25:37 +00:00
Miao Wang
df584d34b5 Merge "[RenderScript] Add documentation for IntrinsicBLAS, and @hide annotations." into mnc-dev 2015-06-19 21:19:56 +00:00
Luan Nguyen
4fdaf938ee docs: Design section fixes for new templates 
- Fix a number of pages in the Wear design docs

bug: 21762391
Change-Id: I26c18130cdd925d1b40f525dd209329ca2b5cd15
 2015-06-19 14:18:18 -07:00
Adam Lesinski
b6a092990c Merge "BatteryStats: Record doze wake locks" into mnc-dev 2015-06-19 21:13:43 +00:00
Adam Lesinski
9425fe21c9 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
 2015-06-19 14:12:01 -07:00
Joe Fernandez
a309f4a041 am a8b518d7: am 041e01bb: am 003f8567: Merge "updates: build-cmdline-update" into lmp-mr1-ub-docs 
* commit 'a8b518d7c2ca006ad52d5900ebb3ca831490d373':
  updates: build-cmdline-update
 2015-06-19 21:08:08 +00:00
Joe Fernandez
a8b518d7c2 am 041e01bb: am 003f8567: Merge "updates: build-cmdline-update" into lmp-mr1-ub-docs 
* commit '041e01bbdffa85b9b5ffba201d36bd566eaa2651':
  updates: build-cmdline-update
 2015-06-19 20:59:03 +00:00
Yorke Lee
495cac604d 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
 2015-06-19 20:53:34 +00:00
Alan Viverette
d1b5953d41 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
 2015-06-19 20:53:30 +00:00
Yorke Lee
c723b8d742 Merge "Don't save cached contact info in call log when adding call" into mnc-dev 2015-06-19 20:47:08 +00:00
Joe Fernandez
041e01bbdf am 003f8567: Merge "updates: build-cmdline-update" into lmp-mr1-ub-docs 
* commit '003f8567defcb88b2e07b3f85f0b43f74d29b322':
  updates: build-cmdline-update
 2015-06-19 20:45:35 +00:00
Alan Viverette
ac21d5c36e Merge "Invalidate the cached ripple drawable mask if mask layer changes" into mnc-dev 2015-06-19 20:43:19 +00:00
Alan Viverette
690a16c350 Invalidate the cached ripple drawable mask if mask layer changes 
Bug: 21955350
Change-Id: I2e610a5a0af39668b7e9447cfd7d48d35e11d299
 2015-06-19 13:42:39 -07:00