drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
166,952 Commits 1 Branch 0 Tags
Commit Graph

2940 Commits

Author SHA1 Message Date
Wale Ogunwale
2749a5e6ce am e54553c8: am d54b578e: Fix issue #17305377: Don\'t kill process if it still has tasks. 
* commit 'e54553c841f3ca1ebcb822e8b9ab6a412e7bd895':
  Fix issue #17305377: Don't kill process if it still has tasks.
 2014-11-04 19:14:49 +00:00
Wale Ogunwale
d54b578e47 Fix issue #17305377: Don't kill process if it still has tasks. 
We previously killed a process when one of its task was
swiped away in the recents UI. This had negative performance
implications for apps with multiple tasks in recents. Now we
will only kill the process if there are no more tasks associated
with it.

Changed also removes the need for the
ActivityManager.REMOVE_TASK_KILL_PROCESS since ActivityManager
will now only kill a task process if it process has no out
standing tasks.

Bug: 17305377
Change-Id: Ibc39bb328d13c7eab05c04798c2f14887923d9d4
 2014-11-04 10:59:31 -08:00
Kenny Root
affff32908 am d00ced98: am b0cb0734: Merge "Track change to Conscrypt" 
* commit 'd00ced983ee235f72a9261fd967309a2638dde05':
  Track change to Conscrypt
 2014-11-03 18:50:21 +00:00
Kenny Root
d00ced983e am b0cb0734: Merge "Track change to Conscrypt" 
* commit 'b0cb07348e6320ce51d0e8b88d240ecf834850d1':
  Track change to Conscrypt
 2014-11-03 18:40:55 +00:00
Kenny Root
b0cb07348e Merge "Track change to Conscrypt" 2014-11-03 18:34:00 +00:00
Narayan Kamath
cd4910ef60 am 2e1bd46a: am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API.""" 
* commit '2e1bd46a1567fa987df04dd8eef66e91b50ef4f3':
  Revert "Revert "Remove unused apache related API.""
 2014-11-03 14:38:02 +00:00
Narayan Kamath
2e1bd46a15 am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API.""" 
* commit 'ef5d43a7cf694ffac8b0069aa5026862d6b32735':
  Revert "Revert "Remove unused apache related API.""
 2014-11-03 14:31:11 +00:00
Narayan Kamath
ef5d43a7cf Merge "Revert "Revert "Remove unused apache related API.""" 2014-11-03 14:24:17 +00:00
Narayan Kamath
4b8f1846ca Revert "Revert "Remove unused apache related API."" 
This reverts commit 31f54ef8150019e4a8c501181806199ef7699fea.

Change-Id: Ib8fc22e3a23b2c06400cd687e8ed9cef9a11d09b
 2014-11-03 13:32:10 +00:00
Kenny Root
8a97063720 Track change to Conscrypt 
Change way in which an outside caller can get the preferred SSLContext.

Bug: 17136008
Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09
 2014-10-31 12:06:09 -07:00
Narayan Kamath
78b3f5ab70 am fa945c10: am e87d36f8: Merge "Revert "Remove unused apache related API."" 
* commit 'fa945c105b4f7bb3e3844e8ce467ca701d5f3a9f':
  Revert "Remove unused apache related API."
 2014-10-29 19:34:10 +00:00
Elliott Hughes
b5ce284aa8 resolved conflicts for merge of d3389e2f to lmp-mr1-dev-plus-aosp 
Change-Id: Ic4969a59ef22d4911f74cc1e75ea5ccfab59b770
 2014-10-29 12:31:48 -07:00
Narayan Kamath
7192f0d2ac am b27ea563: am 00fd3639: Merge "Remove tests/SslLoad." 
* commit 'b27ea56312692c5ee0f38dad38e2a3832086b40a':
  Remove tests/SslLoad.
 2014-10-29 17:47:15 +00:00
Narayan Kamath
fa945c105b am e87d36f8: Merge "Revert "Remove unused apache related API."" 
* commit 'e87d36f8925a34f85ba80c886757d07ad03fed42':
  Revert "Remove unused apache related API."
 2014-10-29 11:30:11 +00:00
Narayan Kamath
d3389e2f32 resolved conflicts for merge of 9834af9c to stage-aosp-master 
Change-Id: Ibdada14406f49684cf345162204b9810452f25a2
 2014-10-29 11:23:45 +00:00
Narayan Kamath
b27ea56312 am 00fd3639: Merge "Remove tests/SslLoad." 
* commit '00fd36399fd8dd9566b582c24817d130982bc270':
  Remove tests/SslLoad.
 2014-10-29 05:47:26 +00:00
Narayan Kamath
e87d36f892 Merge "Revert "Remove unused apache related API."" 2014-10-27 16:55:42 +00:00
Narayan Kamath
31f54ef815 Revert "Remove unused apache related API." 
This reverts commit 3f2714e18bfd979aefefa1d45c50a69fca21cf14.

Change-Id: Ie0e51897ab509d112dc37ca7b90b4139b0a82d8d
 2014-10-27 16:55:14 +00:00
Narayan Kamath
9834af9ccf Merge "Remove unused apache related API." 2014-10-27 16:17:21 +00:00
Narayan Kamath
3f2714e18b Remove unused apache related API. 
Hidden and used only in unit tests.

Change-Id: I492b735f0f7e129946e28c31ad9d91c98aacf987
 2014-10-24 14:27:07 +01:00
Narayan Kamath
3f2d1a460a Remove tests/SslLoad. 
Crufty code that hasn't been touched in the past five years.
The test seems generally useless and there are dozens of richer
tests and benchmarks in conscrypt and libcore.

Change-Id: Ifbec8d419fd37f3b6323c9c74f47d0b7c85c9d4b
 2014-10-24 14:16:41 +01:00
John Reck
76f24bde78 am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev 
* commit 'e73a54f33c029552469fcf1cda46eed2f360a38e':
  Surface:lockHardwareCanvas
 2014-10-21 21:39:36 +00:00
John Reck
bb2d0cc7e1 Surface:lockHardwareCanvas 
Bug: 17440886

Change-Id: I1f2d98c63ec1a2814c2258cf7e0096139263770a
 2014-10-21 13:23:56 -07:00
ztenghui
6a7335acd8 am 3406be85: am 5237c0c3: Merge "Support negative value in exponential data in the pathData." into lmp-mr1-dev 
* commit '3406be853d21af58d551adbde805706f43ef51e2':
  Support negative value in exponential data in the pathData.
 2014-10-10 20:12:06 +00:00
ztenghui
5237c0c3c9 Merge "Support negative value in exponential data in the pathData." into lmp-mr1-dev 2014-10-10 19:59:23 +00:00
ztenghui
897f6daeff Support negative value in exponential data in the pathData. 
Now "1e-5" will not be separated as "1e" and "-5".

Add one test for this use case.
Make sure we print out the pathData when path parsing has error.

b/17919923

Change-Id: I10a00ce21166cfb5a009c49c1a93f40eeb956d83
 2014-10-10 11:11:34 -07:00
Sandeep Siddhartha
f9c45addce am a591efe2: am dbc9aa2c: am eecf74bc: am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-dev 
* commit 'a591efe2839d45fe40928e97bf8c3c8c16e6ac82':
  Add tests for model management [SDK Only]
 2014-10-10 17:14:23 +00:00
ztenghui
39af6ae064 am a92dd37f: am e6411c76: Merge "Support dot separation as the svg path data did." into lmp-mr1-dev 
* commit 'a92dd37feb28923c1633b85d12382bc2aa2e03da':
  Support dot separation as the svg path data did.
 2014-10-10 16:57:03 +00:00
Sandeep Siddhartha
dbc9aa2c7c am eecf74bc: am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-dev 
* commit 'eecf74bcf7746c20f4b8cf69448e4b292357026d':
  Add tests for model management [SDK Only]
 2014-10-10 00:30:18 +00:00
Sandeep Siddhartha
f49c37d0b9 am ed65c63b: Merge "Add tests for model management [SDK Only]" into lmp-dev 
* commit 'ed65c63bdc4a4413da5195f7e5fa392ce72f6135':
  Add tests for model management [SDK Only]
 2014-10-09 17:57:53 +00:00
Sandeep Siddhartha
ed65c63bdc Merge "Add tests for model management [SDK Only]" into lmp-dev 2014-10-09 17:54:16 +00:00
ztenghui
e6411c76c4 Merge "Support dot separation as the svg path data did." into lmp-mr1-dev 2014-10-09 16:34:40 +00:00
ztenghui
4cc3e2704a Support dot separation as the svg path data did. 
Like "0.0.0" will be separated to "0.0 .0" now, just to make sure we are more
complied with svg path data.

b/17892882

Change-Id: Id7b64e9882f5174aa794a0256e2a29d66c724876
 2014-10-08 15:51:37 -07:00
Adam Lesinski
5959304e58 am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev 
* commit '1a98dd5cc7ea89793208b51983198bfbeade5ccc':
  Load shared library dependencies for AppWidgets
 2014-10-07 20:47:19 +00:00
Adam Lesinski
d6353c8c0e am 5166be90: am 18ab83e5: am f189c445: am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev 
* commit '5166be9007b65728e0c55e88ef4d25417a8157ce':
  Load shared library dependencies for AppWidgets
 2014-10-07 20:34:50 +00:00
Adam Lesinski
18ab83e571 am f189c445: am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev 
* commit 'f189c445b84365a3f1bd2b678fdca37f9df8d5d1':
  Load shared library dependencies for AppWidgets
 2014-10-07 20:03:24 +00:00
Adam Lesinski
1a98dd5cc7 Merge "Load shared library dependencies for AppWidgets" into lmp-dev 2014-10-07 19:51:17 +00:00
Adam Lesinski
d00bb5edcf Load shared library dependencies for AppWidgets 
PackageManager and AppWidgetHostServiceImpl should
be loading the resources of any shared libraries being
used by the app, as they have references in their Widgets
or application icons/labels, etc.

Bug:17668152
Change-Id: I359662334edb125d7570089916727df4eeba02bb
 2014-10-07 12:14:45 -07:00
Sandeep Siddhartha
b585ac5b5e Add tests for model management [SDK Only] 
This doesn't change any functionality/APIs etc.
It allows us to launch the activity and manually test the enrollment
methods.

Bug: 17885286
Change-Id: I506d9bb98a592131c04a50c9d6224164ffe07183
 2014-10-07 11:24:51 -07:00
Dianne Hackborn
8b718b80e0 am db75703b: am 2f577e83: am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit 'db75703b261e1d1446cca210d7dcafa3279c31bc':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:39:50 +00:00
Dianne Hackborn
2f577e83cb am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '90d557b7a68e64e049a44560b76b959ef87f13d7':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:22:53 +00:00
Dianne Hackborn
2131b18542 am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '7f7d240b13b96b617e298c6178af0425308f5ef9':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 18:58:57 +00:00
Dianne Hackborn
2d7576b082 Fix issue #17752399: Multiple apps broken by GET_TASKS permission change 
Keep around GET_TASKS as a permission available to apps, so apps still
think they have it and don't get all uppity because they don't.

Add a new REAL_GET_TASKS that is the actual permission now.

Plus some temporary compatibility code until everyone can transition
fromn GET_TASKS to REAL_GET_TASKS.

Change-Id: I12c1102eed24844685dcbd2fa3b612811603958f
 2014-10-03 16:26:04 -07:00
Neil Fuller
c2a0b4482d resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp 
Change-Id: I2588c65b7a9fa43f968151a206924a804f0595a7
 2014-10-02 14:32:37 +01:00
Neil Fuller
f7cf5d43aa resolved conflicts for merge of ee665151 to lmp-dev-plus-aosp 
Change-Id: I97671e62de26919e391dbb2686511584c59ab990
 2014-10-02 11:48:08 +01:00
wsmlby
2e7aa67585 am 489502cf: am 7e1ae00c: Merge "Throw error when no intent can be found" into lmp-dev 
* commit '489502cf606b12cc0f872cec6dfd18d0e41db93f':
  Throw error when no intent can be found
 2014-10-01 22:18:13 +00:00
Adam Powell
8628387c60 am b226d295: am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev 
* commit 'b226d2951c8641f9851e40b4e13b4ae25cb1a482':
  Revert "Fix issue with using locally defined attrs in a shared lib"
 2014-10-01 22:15:56 +00:00
ztenghui
2298938cef Merge "More test cases from UX team for AVD." into lmp-mr1-dev 2014-10-01 21:10:57 +00:00
wsmlby
6bd30ee1a2 Throw error when no intent can be found 
bug: 17396762

Change-Id: I10502d5d1e2332d9e6820ee645234c125e937b7a
 2014-10-01 20:57:55 +00:00
Adam Powell
908c748096 Revert "Fix issue with using locally defined attrs in a shared lib" 
This reverts commit 5069dd69898bd0d9c69ba2bbd37239ec8d1c9dc6.

The reverted commit caused issues loading resources supplied by static libraries.

Bug 17748356

Change-Id: I860a4f31451ee7c03c02974826472a67226b029f
 2014-10-01 18:11:18 +00:00