Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
175,803 Commits 3 Branches 0 Tags
0fe87f68d16f4eb855b52da5dcc6bfbea47a92be
Commit Graph

23608 Commits

Author SHA1 Message Date
Craig Mautner
4844f939b6 am b62b1b03: am 94dab3ae: am 9dba1073: Merge "Force additional layout pass after drawing" into lmp-mr1-dev 
* commit 'b62b1b03792e7c583ec1a51a3d621deb51663414':
  Force additional layout pass after drawing
 2014-12-01 21:12:25 +00:00
Craig Mautner
b62b1b0379 am 94dab3ae: am 9dba1073: Merge "Force additional layout pass after drawing" into lmp-mr1-dev 
* commit '94dab3ae5468e2c6325b47aa633d08dc7727198b':
  Force additional layout pass after drawing
 2014-12-01 21:06:36 +00:00
Craig Mautner
94dab3ae54 am 9dba1073: Merge "Force additional layout pass after drawing" into lmp-mr1-dev 
* commit '9dba10732802bf162c0098d2591aa284e55b7b5e':
  Force additional layout pass after drawing
 2014-12-01 21:00:51 +00:00
Craig Mautner
9dba107328 Merge "Force additional layout pass after drawing" into lmp-mr1-dev 2014-12-01 20:56:09 +00:00
Wale Ogunwale
0ea8edef69 am ea64d0be: am e05fbd69: am 997e632f: Merge "Added unique id to display devices and their settings." into lmp-mr1-dev 
* commit 'ea64d0beea59e3350bea0c6fe8d7cef807f82601':
  Added unique id to display devices and their settings.
 2014-12-01 20:44:06 +00:00
Wale Ogunwale
ea64d0beea am e05fbd69: am 997e632f: Merge "Added unique id to display devices and their settings." into lmp-mr1-dev 
* commit 'e05fbd6901eb8c89ea18fe90c15d69e7c17596ae':
  Added unique id to display devices and their settings.
 2014-12-01 20:37:01 +00:00
Wale Ogunwale
e05fbd6901 am 997e632f: Merge "Added unique id to display devices and their settings." into lmp-mr1-dev 
* commit '997e632f59b070dabf71d9e807847c0643da92ac':
  Added unique id to display devices and their settings.
 2014-12-01 20:30:33 +00:00
Wale Ogunwale
997e632f59 Merge "Added unique id to display devices and their settings." into lmp-mr1-dev 2014-12-01 20:26:06 +00:00
Mike Lockwood
bcf4fec94c Merge "Remove polling for ALSA device files in USB audio device detection." 2014-12-01 20:25:20 +00:00
Mike Lockwood
fb0a22eb62 Remove polling for ALSA device files in USB audio device detection. 
Change-Id: I993fe41707fc02c9449800c7325aaf7270fb892e
 2014-12-01 12:21:41 -08:00
Jeremy Joslin
88eab40f86 am b81134f2: am 33783a96: am 500f7811: Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev 
* commit 'b81134f21187aed11f591526a4f478d411b7f54a':
  Fix the ordering of extra values in the PI.
 2014-12-01 20:07:32 +00:00
Jeremy Joslin
b81134f211 am 33783a96: am 500f7811: Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev 
* commit '33783a962f3336400d12cd739ae33b9452ea14be':
  Fix the ordering of extra values in the PI.
 2014-12-01 20:01:02 +00:00
Amith Yamasani
bd815f90ca am e434a949: am 0c81034c: am 731a5c1a: Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev 
* commit 'e434a94936c8f48bd5158849a09c1e6ce8d6e2d1':
  Fix parsing bug that affects reading back guest restrictions
 2014-12-01 19:54:55 +00:00
Amith Yamasani
e434a94936 am 0c81034c: am 731a5c1a: Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev 
* commit '0c81034cac4efe7d538ff303cc9f2badbb22b8d8':
  Fix parsing bug that affects reading back guest restrictions
 2014-12-01 19:48:36 +00:00
Jeremy Joslin
33783a962f am 500f7811: Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev 
* commit '500f781110dee5aad53410e9ef9b4003123c6981':
  Fix the ordering of extra values in the PI.
 2014-12-01 19:42:24 +00:00
Narayan Kamath
d198c3269a am 53651b99: am ff45e7df: am 1d184ace: resolved conflicts for merge of 7377998d to lmp-mr1-dev 
* commit '53651b9982f53236b767d766e85ec0ce3acc6f0f':
  Be increasingly aggressive about fstrim if it isn't being run
 2014-12-01 19:37:59 +00:00
Jeremy Joslin
500f781110 Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev 2014-12-01 19:36:04 +00:00
Narayan Kamath
53651b9982 am ff45e7df: am 1d184ace: resolved conflicts for merge of 7377998d to lmp-mr1-dev 
* commit 'ff45e7df8aae0f55ce719de92102c7d522b62048':
  Be increasingly aggressive about fstrim if it isn't being run
 2014-12-01 19:32:12 +00:00
Jeff Sharkey
916d516349 am e4a5faa6: Merge "APK still has privileged flag after being moved from "/system/priv-app"" into lmp-mr1-dev 
* commit 'e4a5faa61e9084333b241531ddb941684f110566':
  APK still has privileged flag after being moved from "/system/priv-app"
 2014-12-01 19:00:51 +00:00
Jeff Sharkey
e4a5faa61e Merge "APK still has privileged flag after being moved from "/system/priv-app"" into lmp-mr1-dev 2014-12-01 18:56:57 +00:00
Amith Yamasani
0c81034cac am 731a5c1a: Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev 
* commit '731a5c1a29e5bdbf6e7e4bade9b80f7abe6ec37e':
  Fix parsing bug that affects reading back guest restrictions
 2014-12-01 18:38:14 +00:00
Amith Yamasani
731a5c1a29 Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev 2014-12-01 18:32:11 +00:00
Akira Numata
48e17629b0 APK still has privileged flag after being moved from "/system/priv-app" 
When an app is moved from "/system/priv-app" to another location
during OTA update, the privileged flag should be removed.

(cherry picked from commit 76bf60ead8)

Change-Id: I39feeac7ece89c28045d196ae69fc974b1c6510b
 2014-12-01 09:38:48 -08:00
Craig Mautner
683f37db5c am 1764465d: am b5981aa8: am ee7c30e1: Merge "Avoid capture all black screenshot bitmap" 
* commit '1764465d81ad194d00bab372d2bfa031d75d641a':
  Avoid capture all black screenshot bitmap
 2014-12-01 16:54:45 +00:00
Craig Mautner
1764465d81 am b5981aa8: am ee7c30e1: Merge "Avoid capture all black screenshot bitmap" 
* commit 'b5981aa8d18dbd952ff74a75f962d4ec98f38807':
  Avoid capture all black screenshot bitmap
 2014-12-01 16:49:34 +00:00
tingna_sung
e3ca048397 Avoid capture all black screenshot bitmap 
Captured screenshot bitmap is all black one if none of windows is
surface shown.

Change-Id: I651b2ade1865926d61f945167d60219535fa8bf8
Signed-off-by: tingna_sung <tingna_sung@htc.com>
 2014-12-01 15:22:43 +08:00
Craig Mautner
1d027d6661 am bda8e419: am be342ef0: am c4cf78f4: Merge "[ActivityManager] Ensure provider external access count will be released." 
* commit 'bda8e4192a26b5ab137ba3c22ea00b493a1b673e':
  [ActivityManager] Ensure provider external access count will be released.
 2014-12-01 05:33:49 +00:00
Craig Mautner
ad9c287add am 10c40fc0: am a12ac54c: am 25596374: Merge "[ActivityManager] Prevent provider from been created twice." 
* commit '10c40fc01d56ee17068cb61d5c19e6ab68f2ca48':
  [ActivityManager] Prevent provider from been created twice.
 2014-12-01 05:33:43 +00:00
Craig Mautner
8768672e78 am 62404e15: am 6151b118: am 94ac906b: Merge "Fix pointer index out of range exception" 
* commit '62404e15f9d9935eb42b7cc559e95018b34bc307':
  Fix pointer index out of range exception
 2014-12-01 05:33:37 +00:00
Craig Mautner
a675838a6c am 5a6c1962: am 11c67c92: am 7db48ed0: Merge "Reset killedByAm flag at attachApplicationLocked" 
* commit '5a6c1962590979d0722da0547a6ba3ae1a98dd04':
  Reset killedByAm flag at attachApplicationLocked
 2014-12-01 05:33:27 +00:00
Craig Mautner
bda8e4192a am be342ef0: am c4cf78f4: Merge "[ActivityManager] Ensure provider external access count will be released." 
* commit 'be342ef034f05c6864aaa85ab25c009148954552':
  [ActivityManager] Ensure provider external access count will be released.
 2014-12-01 05:27:08 +00:00
Craig Mautner
10c40fc01d am a12ac54c: am 25596374: Merge "[ActivityManager] Prevent provider from been created twice." 
* commit 'a12ac54cf69c0c8cfec6fa7c14176b714cae7107':
  [ActivityManager] Prevent provider from been created twice.
 2014-12-01 05:27:00 +00:00
Craig Mautner
62404e15f9 am 6151b118: am 94ac906b: Merge "Fix pointer index out of range exception" 
* commit '6151b118b663b0620fee4fb87d9d143c6fd050b8':
  Fix pointer index out of range exception
 2014-12-01 05:26:53 +00:00
Craig Mautner
5a6c196259 am 11c67c92: am 7db48ed0: Merge "Reset killedByAm flag at attachApplicationLocked" 
* commit '11c67c92de3522a50b9994eb83e34c152902ad18':
  Reset killedByAm flag at attachApplicationLocked
 2014-12-01 05:26:37 +00:00
Craig Mautner
c4cf78f4d3 Merge "[ActivityManager] Ensure provider external access count will be released." 2014-12-01 00:20:33 +00:00
Craig Mautner
2559637429 Merge "[ActivityManager] Prevent provider from been created twice." 2014-12-01 00:16:41 +00:00
Craig Mautner
94ac906b10 Merge "Fix pointer index out of range exception" 2014-12-01 00:13:28 +00:00
Craig Mautner
7db48ed036 Merge "Reset killedByAm flag at attachApplicationLocked" 2014-11-30 23:55:13 +00:00
Olawale Ogunwale
ef68eaa9b1 am 21aadfcf: am f5860728: am 87c5f362: Merge "Fix bad exclude region in landscape" 
* commit '21aadfcf71c87b50aa2aff20d0a4e76aebfb9c38':
  Fix bad exclude region in landscape
 2014-11-27 14:01:18 +00:00
Olawale Ogunwale
21aadfcf71 am f5860728: am 87c5f362: Merge "Fix bad exclude region in landscape" 
* commit 'f586072861850ade660e11eafa799f96314ce475':
  Fix bad exclude region in landscape
 2014-11-27 13:54:37 +00:00
Craig Mautner
f651225d58 am 205dc8f9: am 980ce4ba: am 200496b5: Merge "ANR caused by incorrect cleanup in BroadcastQueue." 
* commit '205dc8f94cfd469c2a845d9fb010efba7f9aaba9':
  ANR caused by incorrect cleanup in BroadcastQueue.
 2014-11-27 12:08:26 +00:00
Jeff Sharkey
a6f1257a33 am 1446c6c6: am d76737a7: am b802cd67: Merge "APK still has privileged flag after being moved from "/system/priv-app"" 
* commit '1446c6c6f67d285bd47b878de6326b8e82fafb2b':
  APK still has privileged flag after being moved from "/system/priv-app"
 2014-11-27 12:08:18 +00:00
Craig Mautner
205dc8f94c am 980ce4ba: am 200496b5: Merge "ANR caused by incorrect cleanup in BroadcastQueue." 
* commit '980ce4bad08f65e559c39e86e799389c6615297e':
  ANR caused by incorrect cleanup in BroadcastQueue.
 2014-11-27 12:01:33 +00:00
Jeff Sharkey
1446c6c6f6 am d76737a7: am b802cd67: Merge "APK still has privileged flag after being moved from "/system/priv-app"" 
* commit 'd76737a7325bdcd5010f26fd1626628f07070bb9':
  APK still has privileged flag after being moved from "/system/priv-app"
 2014-11-27 12:01:18 +00:00
Narayan Kamath
ff45e7df8a am 1d184ace: resolved conflicts for merge of 7377998d to lmp-mr1-dev 
* commit '1d184acefa7105592134edebf7de4d77843d5791':
  Be increasingly aggressive about fstrim if it isn't being run
 2014-11-27 10:09:46 +00:00
Narayan Kamath
1d184acefa resolved conflicts for merge of 7377998d to lmp-mr1-dev 
Change-Id: I21870e241de7d992e97d7b91e0058f85b5a25fbe
 2014-11-27 09:57:35 +00:00
riddle_hsu
105add8d1a [ActivityManager] Prevent provider from been created twice. 
Root Cause:
If a process which contains provider is starting but not
from accessing provider, e.g. service/activity/receiver,
its providers' will be created during handleBindApplication.
And before the process complete publish provider to
ActivityManagerService, if there is an access call to
process provider before the process completes publishing
providers to ActivityManagerService, then the providers
will be created again.


Solution:
Don't schedule install provider if the provider record
already exist and will be published later.

Change-Id: Ic200ceae042c014c86e7edee0acd013b513af334
 2014-11-27 05:16:17 +00:00
tingna_sung
4f65ca0f76 Fix pointer index out of range exception 
Avoid pointer index out of range error if return value is -1 of
findPointerIndex() when there is no data available for that pointer
identifier.

Change-Id: I2a08f04c678164e220852094baa124ba157e2e42
Signed-off-by: tingna_sung <tingna_sung@htc.com>
 2014-11-27 08:32:14 +08:00
Olawale Ogunwale
87c5f36210 Merge "Fix bad exclude region in landscape" 2014-11-26 23:13:59 +00:00
Kazuki Nakayama
609cb91c9c Reset killedByAm flag at attachApplicationLocked 
ActivityManager reuses a process record object that killed
by him under some situation. That reused process record inherits
a killedByAm flag unexpectedly.
The killedByAm flag must be reset otherwise ActivityManager can't
judge the process can be killed or not.

Change-Id: If95137d91939cc44882ad2813131bcde0edd0c1b
 2014-11-26 15:07:33 -08:00