Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
179,909 Commits 3 Branches 0 Tags
fa58f454c177e35f774dec3d2987628fa6359239
Commit Graph

5313 Commits

Author SHA1 Message Date
Craig Mautner
91934a3b2f am 19c549fc: am 1e263d3f: am 66b4d484: Merge "Prevent system server dump stuck by pipe buffer full." 
* commit '19c549fc735bf8a1df5cccb6cc0cdf46c7d242a4':
  Prevent system server dump stuck by pipe buffer full.
 2015-01-13 20:33:08 +00:00
Olawale Ogunwale
be37df395e am 9d293911: am ebdfb6e8: Merge "[ActivityManager] Distinguish FG or BG receiver finished" 
automerge: 0f8ecc8

* commit '0f8ecc84c8b86054bfd3275f942c3a705df01fbb':
  [ActivityManager] Distinguish FG or BG receiver finished
 2015-01-13 20:19:57 +00:00
Craig Mautner
19c549fc73 am 1e263d3f: am 66b4d484: Merge "Prevent system server dump stuck by pipe buffer full." 
* commit '1e263d3f140e90966790875a815f23c92550f2f2':
  Prevent system server dump stuck by pipe buffer full.
 2015-01-13 04:20:23 +00:00
Craig Mautner
66b4d48469 Merge "Prevent system server dump stuck by pipe buffer full." 2015-01-13 04:08:05 +00:00
Olawale Ogunwale
0f8ecc84c8 am 9d293911: am ebdfb6e8: Merge "[ActivityManager] Distinguish FG or BG receiver finished" 
* commit '9d293911221cac930eb8edfef01362ea083eeaab':
  [ActivityManager] Distinguish FG or BG receiver finished
 2015-01-12 16:44:28 +00:00
Olawale Ogunwale
ebdfb6e864 Merge "[ActivityManager] Distinguish FG or BG receiver finished" 2015-01-12 13:45:13 +00:00
Jeff Sharkey
df38a17020 am 2b46774f: Merge "Guard against MountService throwing NPE." into lmp-mr1-dev automerge: 0cb736f 
automerge: d6a8c32

* commit 'd6a8c32a6a2ac07f25f65622366ccb4ccffbdcdd':
  Guard against MountService throwing NPE.
 2015-01-09 19:29:24 +00:00
Jeff Sharkey
d6a8c32a6a am 2b46774f: Merge "Guard against MountService throwing NPE." into lmp-mr1-dev 
automerge: 0cb736f

* commit '0cb736f754d8f487ebe4c8cc670e5dd2589eaea1':
  Guard against MountService throwing NPE.
 2015-01-09 19:24:31 +00:00
Jeff Sharkey
2b46774ff9 Merge "Guard against MountService throwing NPE." into lmp-mr1-dev 2015-01-09 19:14:29 +00:00
Mathieu Chartier
c2c2e26fd4 Merge "Call VMRuntime.clampGrowthLimit for small heap apps" automerge: 9a6c45e automerge: 117ba18 
automerge: eb896e1

* commit 'eb896e1febd57eba541b8760bcd7010457598b85':
  Call VMRuntime.clampGrowthLimit for small heap apps
 2015-01-09 00:40:23 +00:00
Mathieu Chartier
eb896e1feb Merge "Call VMRuntime.clampGrowthLimit for small heap apps" automerge: 9a6c45e 
automerge: 117ba18

* commit '117ba186d1d28ae7eb6d1187c795e502668fa9b4':
  Call VMRuntime.clampGrowthLimit for small heap apps
 2015-01-09 00:28:33 +00:00
Mathieu Chartier
9a6c45eedd Merge "Call VMRuntime.clampGrowthLimit for small heap apps" 2015-01-09 00:17:16 +00:00
Mathieu Chartier
24cee07160 Call VMRuntime.clampGrowthLimit for small heap apps 
If the manifest doesn't specify large heaps, we now call
VMRuntime.clampGrowthLimit to release heap virtual address space
which won't ever get used.

Bug: 18387825
Bug: 17131630
Change-Id: I61fdcd70c70234256637eeebefe3abb22b91095d
 2015-01-08 14:42:20 -08:00
Jeff Sharkey
9708669b2f Guard against MountService throwing NPE. 
Fall through to below logic and return null instead of crashing the
entire app.  We already tell developers the value may be null.

Bug: 17781998
Change-Id: I05dce90ae6bc547d74f8c16d30b3dc7888a937fe
 2015-01-08 14:00:15 -08:00
Christopher Tate
81a2b3f82a am 413ec4a6: am bee49807: Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev 
automerge: e045188

* commit 'e04518866e0c75e6c96976aca77f24dc22b51416':
  Support single-package backup rejection by the transport
 2015-01-07 23:32:28 +00:00
Christopher Tate
e04518866e am 413ec4a6: am bee49807: Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev 
* commit '413ec4a6573ffa88bf02a796eb8c9dc7dfa839ca':
  Support single-package backup rejection by the transport
 2015-01-07 23:30:34 +00:00
Amith Yamasani
5c72de4cee am 442dcb17: am 21735e22: am dcf323ad: Merge "NPE in SearchManager.triggerSearch" 
* commit '442dcb1761f5f200c12c3f86409f780fbcf20e51':
  NPE in SearchManager.triggerSearch
 2015-01-07 00:58:04 +00:00
Amith Yamasani
442dcb1761 am 21735e22: am dcf323ad: Merge "NPE in SearchManager.triggerSearch" 
* commit '21735e222e0009b1ddcb080faa5b51117d0da879':
  NPE in SearchManager.triggerSearch
 2015-01-07 00:17:09 +00:00
Amith Yamasani
dcf323adaf Merge "NPE in SearchManager.triggerSearch" 2015-01-07 00:05:11 +00:00
Christopher Tate
b89e1405cf Support single-package backup rejection by the transport 
We now cleanly handle the case of the transport blacklisting specific
packages from key/value backup.  Previously we would halt the entire
backup pass and reschedule if the transport returned any error from
performBackup(pkg).  Now, we recognize the TRANSPORT_PACKAGE_REJECTED
result from that invocation, and properly drop that package's work
but proceed with running the rest of the backup queue as expected.

Bug 18694053

Change-Id: Id0dd6d59492bdea9f970540d776f37db0cc5d99c
 2015-01-06 15:48:33 -08:00
Alan Viverette
7768fd2f8e am bf80d273: am 74890242: Merge "Don\'t override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev 
automerge: 74882cb

* commit '74882cb0e3810ab1d77bc85a9ed1fa2b024a0159':
  Don't override dialog icon drawable unless valid resource ID was set
 2015-01-05 21:50:18 +00:00
Alan Viverette
74882cb0e3 am bf80d273: am 74890242: Merge "Don\'t override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev 
* commit 'bf80d2737fc59e8ae04875edddf1534c6a7739bc':
  Don't override dialog icon drawable unless valid resource ID was set
 2015-01-05 21:48:58 +00:00
Alan Viverette
5c2d8f7d51 Don't override dialog icon drawable unless valid resource ID was set 
Fixes a regression where Builder.setIcon(Drawable) would get overridden
even when Builder.setIcon(int) had never been called and was still 0.
Fixes attribute id to respect all valid resource IDs (e.g. non-zero).
Updates documentation to reflect the long-standing override behavior.

BUG: 18904762
Change-Id: I905703993a59910555d5a858e0aaecab63221a02
 2015-01-05 12:56:45 -08:00
riddle_hsu
1f5ac4d322 [ActivityManager] Distinguish FG or BG receiver finished 
Symptom:
Assume a foreground broadcast FG and a background BG.
If a recevier registers both FG and BG. When sending
BG and FG to the receiver, and the receiver BG receiver
completes first, its finishReceiver will trigger next FG
receiver rather than BG, and also deliver wrong result
code/data to the next.

More detail and sample:
https://code.google.com/p/android/issues/detail?id=92917

Root cause:
Due to BroadcastQueue:getMatchingOrderedReceiver will match
by receiver(IBinder), so the caller ActivityManagerService:
broadcastRecordForReceiverLocked will always match the first
queue(fg) if a receiver is both receiving fg and bg.

Solution:
Add a parameter flags to finishReceiver, then server side
could know the finished receiver should belong to which queue.

Another general solution but with bigger scope:
I60dce4a48e20c1002a61a979e4d78b9b0a8b94a0

Change-Id: I913ca6f101ac8ec6c7a8e42754e6781f80247b7f
 2015-01-03 15:38:21 +08:00
Esteban Talavera
8add57224f Remove deprecated version of setProfileOwner that takes packageName 
The ComponentName equivalent should be used instead.

Bug: 17654371
Change-Id: I7001e86ab1709b824944148a3c44af5243dacb83
 2014-12-24 09:38:13 +00:00
Kris Giesing
0dd962db3e Merge "Fix minor spelling and grammar errors in public JavaDoc" 2014-12-19 23:56:44 +00:00
Winson Chung
f69fe23bff am 4edaa5e4: am a320b217: Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-mr1-dev 
automerge: 5d40d0b

* commit '5d40d0b645e31063d08e304e4ba2880b267234b9':
  Bug 18784289: Fix issue with transition animation callback.
 2014-12-18 21:56:20 +00:00
Winson Chung
5d40d0b645 am 4edaa5e4: am a320b217: Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-mr1-dev 
* commit '4edaa5e4b65c9bac4ab9bdc26b4cdde217a9053a':
  Bug 18784289: Fix issue with transition animation callback.
 2014-12-18 21:53:36 +00:00
Winson Chung
a320b2176c Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-mr1-dev 2014-12-18 19:30:40 +00:00
Winson Chung
e494c382c0 Bug 18784289: Fix issue with transition animation callback. 
This is a regression where we changed the source view for the transition
to dummy view, but since it was not yet attached, it could not get the
handler implicitly to post the onAnimationCompleted callback.  This CL
modifies these ActivityOption transitions to also take an explicit
handler to process the callback on.

Bug: 18784289

Change-Id: I73f745c33b9f8aed91f8d9cd975f37cf7e4128f1
 2014-12-18 11:27:18 -08:00
Olawale Ogunwale
c946e92e6c am 486a9942: Merge "[ActivityManager] Use synchronized to protect object" automerge: e3b07b4 
automerge: a230a43

* commit 'a230a43204e3567d93a2d914123b21c14bdf495d':
  [ActivityManager] Use synchronized to protect object
 2014-12-17 21:55:05 +00:00
Olawale Ogunwale
a230a43204 am 486a9942: Merge "[ActivityManager] Use synchronized to protect object" 
automerge: e3b07b4

* commit 'e3b07b4856d55f7d96dcb25e3749c7cce1a1cd3d':
  [ActivityManager] Use synchronized to protect object
 2014-12-17 21:50:31 +00:00
Olawale Ogunwale
486a9942eb Merge "[ActivityManager] Use synchronized to protect object" 2014-12-17 21:42:44 +00:00
Jorim Jaggi
92c9be1c12 am 3a70523e: am 4a5129c8: am c3059b44: Merge "Fix colored icons in doze mode" into lmp-mr1-dev 
* commit '3a70523eb63c4f61dcd6fcf52f1d9ebae7482027':
  Fix colored icons in doze mode
 2014-12-17 19:39:49 +00:00
Jorim Jaggi
3a70523eb6 am 4a5129c8: am c3059b44: Merge "Fix colored icons in doze mode" into lmp-mr1-dev 
* commit '4a5129c83b92e7ae198f4b9a3018c8cdcba5dd86':
  Fix colored icons in doze mode
 2014-12-17 19:10:43 +00:00
Nicolas Prevot
743a68fc5f am 237637e2: am f2bd50b2: Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev automerge: 47cbcd7 
* commit '237637e22ba9d98171f32d2302b9f532120729a9':
  Fix the doc of addCrossProfileIntentFilter.
 2014-12-17 19:07:50 +00:00
Nicolas Prevot
237637e22b am f2bd50b2: Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev 
automerge: 47cbcd7

* commit '47cbcd7740739796aef113646861ff7e79439a9c':
  Fix the doc of addCrossProfileIntentFilter.
 2014-12-17 19:01:18 +00:00
Jorim Jaggi
c3059b444f Merge "Fix colored icons in doze mode" into lmp-mr1-dev 2014-12-17 18:59:40 +00:00
Jorim Jaggi
92df1f2758 Fix colored icons in doze mode 
Also fixes the issue that small icons promoted to large icons were
not forced to be white, which lead to inconsistent treatment of the
icons.

Bug: 18537470

Change-Id: Ic35e082da12793f3f13c91740bfc345b336c3db4
 2014-12-17 19:57:45 +01:00
Nicolas Prevot
f2bd50b2ec Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1-dev 2014-12-17 18:54:55 +00:00
Nicolas Prevot
fc7b444462 Fix the doc of addCrossProfileIntentFilter. 
Mention that cross-profile-intent-filters only work for activity intents.

BUG:18776618

Change-Id: I209d1e38641b4ae84b682a2525e6ddae603a71f9
 2014-12-17 17:55:08 +00:00
Christoph Studer
58d080e1a2 am f3528480: am 1464dd2f: am 0b22e395: Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev 
* commit 'f35284804b4f04b91d772b913d9a6ae1c8a5f65a':
  Notification: Fix bigLargeIcon
 2014-12-17 15:30:02 +00:00
Christoph Studer
f35284804b am 1464dd2f: am 0b22e395: Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev 
* commit '1464dd2f925f4b6179a7ede287f13431e6835aec':
  Notification: Fix bigLargeIcon
 2014-12-17 15:23:48 +00:00
Christoph Studer
0b22e395d2 Merge "Notification: Fix bigLargeIcon" into lmp-mr1-dev 2014-12-17 15:14:03 +00:00
Kris Giesing
8b6216d314 Fix minor spelling and grammar errors in public JavaDoc 
b/18777215

Change-Id: I2403db4fb94144f0a71243c6b74076482defc9a4
 2014-12-16 17:23:15 -08:00
Christopher Tate
e01429cc58 am 15626d3a: am b32a33ce: Merge "Turn debug flag off" 
automerge: a8fe14a

* commit 'a8fe14a2116e68b22aa9f5d9aefb27e373dc4074':
  Turn debug flag off
 2014-12-16 20:38:31 +00:00
Christopher Tate
a8fe14a211 am 15626d3a: am b32a33ce: Merge "Turn debug flag off" 
* commit '15626d3a493b5eb4c1fecb73f8d4fc18547c4c13':
  Turn debug flag off
 2014-12-16 20:34:37 +00:00
Christoph Studer
3f8140543e am 88fb463e: am 0bb83b07: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev 
automerge: 2bd62b5

* commit '2bd62b53b68834cabb48be608ee350012b1e8043':
  Fix MediaStyle docs mentioning 2 max actions in compact view
 2014-12-16 18:34:33 +00:00
Christoph Studer
2bd62b53b6 am 88fb463e: am 0bb83b07: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev 
* commit '88fb463ea355303f03535a29ac5935bf69d8a50e':
  Fix MediaStyle docs mentioning 2 max actions in compact view
 2014-12-16 18:31:53 +00:00
mark_chen
89764e337b [ActivityManager] Use synchronized to protect object 
Symptom: ArrayIndexOutOfBoundsException at mResourcePackages
Root Cause: Race condition issue
Solution: Use synchronized to protect object

Change-Id: Ia2d89d50919d95d95f6f8ac2eb75594a93e8f2da
 2014-12-16 05:44:34 +00:00