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

126918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
62828dfca2 Merge "Add private circular reveal API on View/RenderNode" 2014-03-26 17:40:32 +00:00
Jean-Michel Trivi
ffa6edefb3 am 564a0cd8: Merge "Continue refactoring of MediaFocusControl" 
* commit '564a0cd87c47ec53790c93197842969a6aab262c':
  Continue refactoring of MediaFocusControl
 2014-03-26 17:40:03 +00:00
Jean-Michel Trivi
564a0cd87c Merge "Continue refactoring of MediaFocusControl" 2014-03-26 17:36:59 +00:00
Chris Wren
6dcd93246f am 4c319992: Merge "always clear the HeadsUpDecayTimer" 
* commit '4c3199928250dfea6307809fd0a2091c78a75240':
  always clear the HeadsUpDecayTimer
 2014-03-26 17:13:42 +00:00
Chris Wren
4c31999282 Merge "always clear the HeadsUpDecayTimer" 2014-03-26 17:09:55 +00:00
Chris Wren
7fd2a3bf6a always clear the HeadsUpDecayTimer 
for non-clearable heads up notifications,
a decay timer may be left in the queue

Bug: 13652819
Change-Id: I533db43484731922790f8501250b5a1ca7d4ba0b
 2014-03-26 13:09:18 -04:00
Nick Kralevich
e620204849 am c7627537: am 32cc40a9: am fdd63510: am 491eaf22: Merge "Note libselinux dependency on packages.list format changes." 
* commit 'c76275377cbc807b3bbc2fc1662ff18c59043e5b':
  Note libselinux dependency on packages.list format changes.
 2014-03-26 16:43:42 +00:00
Nick Kralevich
c76275377c am 32cc40a9: am fdd63510: am 491eaf22: Merge "Note libselinux dependency on packages.list format changes." 
* commit '32cc40a9b57750451a6489e01526dc6a14d72bff':
  Note libselinux dependency on packages.list format changes.
 2014-03-26 16:36:33 +00:00
Nick Kralevich
32cc40a9b5 am fdd63510: am 491eaf22: Merge "Note libselinux dependency on packages.list format changes." 
* commit 'fdd6351067740f80148ff03c43d2ebc91f1d9656':
  Note libselinux dependency on packages.list format changes.
 2014-03-26 15:55:41 +00:00
Nick Kralevich
fdd6351067 am 491eaf22: Merge "Note libselinux dependency on packages.list format changes." 
* commit '491eaf2255a95186e84092eae4ec43582eebb37b':
  Note libselinux dependency on packages.list format changes.
 2014-03-26 08:47:39 -07:00
Nick Kralevich
491eaf2255 Merge "Note libselinux dependency on packages.list format changes." 2014-03-26 15:41:14 +00:00
Kenny Root
587a9455de CertificateChainValidator: initialize TrustManagerFactory 
Need to call TrustManagerFactory#init before use. I suspect this class
isn't used anywhere since this hasn't caused a problem yet.

Change-Id: I17425d0bba4795d71960062361a755830abba7de
 2014-03-26 08:40:45 -07:00
Stephen Smalley
e6e25554d3 Note libselinux dependency on packages.list format changes. 
Change-Id: I3c34a86f5706c4fca826a8634936131e4e4fc297
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2014-03-26 09:19:12 -04:00
riddle_hsu
739e194121 DO NOT MERGE - [ActivityManager] Ensure consistency behavior when a background activity brings another existed activity to front. 
Symptom: ANR occurs on previous activity.
Root Cause:
In KK, when a background activity starts another existed background activity (bring to front),
if current focused stack is not the same as the stack of target starting activity,
it will still resume the top of target stack, even the top activity on the target stack may not the same as target activity.
And it will result incorrect focus, press back key will send to previous stack's top then popup ANR on previous activity:
"Reason: Waiting because no window has focus but there is a focused application".

By original code comment, it looks 'bring to front' should not happen in this issue case.
// If the target task is not in the front, then we need
// to bring it to the front...  except...  well, with
// SINGLE_TASK_LAUNCH it's not entirely clear.  We'd like
// to have the same behavior as if a new instance was
// being started, which means not bringing it to the front
// if the caller is not itself in the front.

If the caller and target are in the same stask, it will just deliver new intent without changing task order (the same behavior as JellyBean).
So the patch concept is just to avoid to use target stack to resume top when caller and target are in different stack.

Solution: Do not allow to resume another stack top if non-top activity try to bring existed activity to front.
It may not be a good solution, just a reminder for the issue case.

Reproduce steps:
Assume A, B, C are different app tasks.
When the application stack is like:
  Top C
      B
      A

 #Case 1: Home is foreground
  A starts B with NEW_TASK, C will resume, focus still stays at Home, and window order does not update.
  Then press back key or volumn key will result ANR on Home.

 #Case 2: App is foreground (Resumed activity is C)
  A starts Home, Home will resume, focus still stays at C, and window order does did not update.
  Then press back key or volumn key will result ANR on C.

Change-Id: If05070123b248e2335791e43a4d4ddee6db11d84
 2014-03-26 20:43:17 +08:00
Christopher Tate
ab8a501f25 Expand install observer semantics 
...and now fail conservatively when two apps both attempt to define
the same permission.

We also finally have a (hidden) interface class for observing package
installation so that we can now rev the interface without breaking
existing callers.

Bug 13551375

Change-Id: I3a286d024a30e812ee4b098f345401df3c00e178
 2014-03-25 19:28:54 -07:00
Dan Sandler
ebc3993c01 am 59f0258a: Categorize some system notifications. 
* commit '59f0258a27ebaf8468919a9d2855c41f0429238d':
  Categorize some system notifications.
 2014-03-26 01:36:31 +00:00
Dan Sandler
59f0258a27 Categorize some system notifications. 
Change-Id: Ia343bc276f50f488e2165056cff249a02f01d45a
 2014-03-26 01:31:04 +00:00
Adam Lesinski
d0c7a509cf am a200414f: Merge "Use new build var to depend on an APKs resources" 
* commit 'a200414ffe471fdec1a77ef11dae015614363ccb':
  Use new build var to depend on an APKs resources
 2014-03-26 00:47:15 +00:00
Adam Lesinski
a200414ffe Merge "Use new build var to depend on an APKs resources" 2014-03-26 00:41:28 +00:00
Craig Mautner
9e829b1f15 am d7dc6f77: am 16744ac3: am d1e32cd3: Merge "Defer removal of activity until animation complete." into klp-modular-dev 
* commit 'd7dc6f77f7bfc54d272f012fbe7d31ed181e430e':
  Defer removal of activity until animation complete.
 2014-03-26 00:37:45 +00:00
Craig Mautner
d7dc6f77f7 am 16744ac3: am d1e32cd3: Merge "Defer removal of activity until animation complete." into klp-modular-dev 
* commit '16744ac3f7b030f1192d298132256ac06eaff205':
  Defer removal of activity until animation complete.
 2014-03-26 00:32:14 +00:00
Svetoslav
5b21d51d40 am 8a2b46d5: Merge "Wrong constant used for undefined accessibility window id." 
* commit '8a2b46d535e28c102b972407faa866cd15246445':
  Wrong constant used for undefined accessibility window id.
 2014-03-26 00:31:42 +00:00
Svetoslav
8a2b46d535 Merge "Wrong constant used for undefined accessibility window id." 2014-03-26 00:28:27 +00:00
Svetoslav
cbcc9695f0 Wrong constant used for undefined accessibility window id. 
Change-Id: I8b14db034a42a7ffd211a46fa3fee7bf2a6eac8f
 2014-03-25 17:27:37 -07:00
Craig Mautner
16744ac3f7 am d1e32cd3: Merge "Defer removal of activity until animation complete." into klp-modular-dev 
* commit 'd1e32cd3207215e8bb63f18c6a5a4880b5344ef8':
  Defer removal of activity until animation complete.
 2014-03-26 00:26:03 +00:00
Jean-Michel Trivi
dda1c4040c Continue refactoring MediaFocusControl 
Rename MediaController to PlayerRecord.

Change-Id: Icf474b4107649f501341309bf7ec520aa1e71586
 2014-03-25 17:25:25 -07:00
Craig Mautner
d1e32cd320 Merge "Defer removal of activity until animation complete." into klp-modular-dev 2014-03-26 00:21:56 +00:00
Scott Main
8eb70c46ff am da5c13eb: am 57be1303: am c3bcce59: am 01e68cab: am ad52a4ce: Merge "fix broken link" into klp-docs 
* commit 'da5c13eb8ae00c853b269996c168ccb7191c4673':
  fix broken link
 2014-03-26 00:19:44 +00:00
Scott Main
da5c13eb8a am 57be1303: am c3bcce59: am 01e68cab: am ad52a4ce: Merge "fix broken link" into klp-docs 
* commit '57be13035205a32707df94ceaf055ffa334d2852':
  fix broken link
 2014-03-26 00:12:20 +00:00
Scott Main
57be130352 am c3bcce59: am 01e68cab: am ad52a4ce: Merge "fix broken link" into klp-docs 
* commit 'c3bcce5907553c6f006fc2c0ac74383f01647827':
  fix broken link
 2014-03-26 00:05:17 +00:00
Adam Lesinski
b0569b98d5 Use new build var to depend on an APKs resources 
Some other projects use LOCAL_APK_LIBRARIES and don't yet
work with the new shared library changes.

Change-Id: Ibb54bc1b5e3eb1252cf5b4e45249b089d25854ac
 2014-03-25 17:04:56 -07:00
Scott Main
c3bcce5907 am 01e68cab: am ad52a4ce: Merge "fix broken link" into klp-docs 
* commit '01e68cabb523440382ef3a02a512f8ce3b8af287':
  fix broken link
 2014-03-25 23:58:10 +00:00
Scott Main
01e68cabb5 am ad52a4ce: Merge "fix broken link" into klp-docs 
* commit 'ad52a4ce9964508288316bfc5fb52833bf70b6a5':
  fix broken link
 2014-03-25 23:53:24 +00:00
Craig Mautner
79e6578b6c Defer removal of activity until animation complete. 
Do not remove an AppWindowToken or its Task if it is running an
animation. Doing so leaves windows orphaned and bad things happen
when the system tries to retrieve the task assoicated with the
windows during layout.

Fixes the ugly output associated with bug 13440426.

Change-Id: I9d5fc50a7cb6189160d51cee3c82f7813baee715
 2014-03-25 16:48:47 -07:00
Scott Main
ad52a4ce99 Merge "fix broken link" into klp-docs 2014-03-25 23:47:00 +00:00
Scott Main
a8c29e19e4 fix broken link 
Change-Id: If2f19d5c65372313860176808a3a0105f9fa118e
 2014-03-25 16:45:40 -07:00
Jean-Michel Trivi
7d3168cef2 Continue refactoring of MediaFocusControl 
Move RemoteControlClient death handler and remote playback state
 inside MediaController class.
Make MediaController data fields private. Document which accessors
 can be removed once the audio focus and media button receiver
 mechanisms are dissociated.

Change-Id: Icd14fb0d99bf74512c8f8552d124c0353ce1f06d
 2014-03-25 16:27:23 -07:00
Chris Craik
8c271ca63b Add private circular reveal API on View/RenderNode 
Change-Id: I139c8e12b354083149a665f6768f3f6931a8dd15
 2014-03-25 16:03:48 -07:00
Ricardo Cervera
a9930ff1c0 am e535c1e5: am 8460e8ff: am 287b5bb2: am 64906b52: am 2564614c: am 39aed838: docs: Amend SDK release notes for 22.6.2 
* commit 'e535c1e5872630eb4d0497c177d3e483f441ce48':
  docs: Amend SDK release notes for 22.6.2
 2014-03-25 23:02:04 +00:00
Will Haldean Brown
24c8ae6124 am a22b3857: am 7e98cee6: am f3f1c7a3: am 63d161e4: Merge "Remove all but two micro themes, light and dark." into klp-modular-dev 
* commit 'a22b385777d4cc3b283a816bfc1c4e34329e72ce':
  Remove all but two micro themes, light and dark.
 2014-03-25 23:02:01 +00:00
Justin Koh
bb41b55f92 am 9a8afb1c: am d89929db: am c635ef99: am ec5b6e87: Merge "Add RobotoCondensed-Light to build." into klp-modular-dev 
* commit '9a8afb1c3aaf49f7d2fae5033b0895ed7de06ce3':
  Add RobotoCondensed-Light to build.
 2014-03-25 23:01:58 +00:00
Ricardo Cervera
f7be507a5c am 1f88794f: am 805f3fae: am 917a83da: am 7133208a: am 89a41db0: am 825280d2: Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs 
* commit '1f88794f41e75501301467c40030fdc12f4fddde':
  docs: Added release notes for Android SDK 22.6.2
 2014-03-25 23:01:54 +00:00
Chris Craik
5adec6184f am e08f1669: am 72cf99ab: am 7e55b35a: am 4118480a: am 80470cdf: Merge "Solve three memory leaks related to PatchCache" 
* commit 'e08f16695540009bed99a9b5c5147188edb496e6':
  Solve three memory leaks related to PatchCache
 2014-03-25 23:01:51 +00:00
Eino-Ville Talvala
aadca48c16 am 42004973: am 1559e0b6: (-s ours) am 63d61640: am 55a1e78f: am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev 
* commit '42004973cde20cd883910db516571db220085c2c':
  DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
 2014-03-25 23:01:48 +00:00
Craig Mautner
9470bc9318 am c9ef91a7: am f07788b9: am c89283c5: am d0955068: am 74e19f57: am 6f955df8: am 550b44d1: am f4644189: am 4cf6286c: am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev 
* commit 'c9ef91a72f4c473d425b522c02ad74550f80b6da':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 23:01:45 +00:00
Scott Main
3d2f353489 am 9a07a66b: am 1adb8947: am 1cf8117a: am dc18ce78: am 78373edb: am 837a4885: fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843 
* commit '9a07a66ba9b159be465ca120296deaf4a31b369c':
  fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843
 2014-03-25 23:01:41 +00:00
Craig Mautner
57b7b9eacf am 57889957: am ac21f995: am 4f61f6d4: am e187441b: Merge commit \'703169a3\' into manualmerge 
* commit '578899571b6228c39dba5730f47317b183f73b4c':
  Don't wait for finishing animation when second display is disconnected
 2014-03-25 23:01:38 +00:00
Kenny Root
13250d8b18 am 6ab41d71: am 266de3ef: am dd3e6399: am c1d863e7: am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt" 
* commit '6ab41d71eb9acbe07257c6cf208d662de82cc22e':
  Use X509ExtendedTrustManager and not Conscrypt
 2014-03-25 23:01:34 +00:00
Craig Mautner
4163b0fbf8 am 4abb86c0: am 732d5aaa: am 12b575bd: am 9bbd2f97: (-s ours) am 2cacc619: Merge "Don\'t wait for finishing animation when second display is disconnected" 
* commit '4abb86c05dcdf5db69873ca484dc018b014e0eb4':
  Don't wait for finishing animation when second display is disconnected
 2014-03-25 23:01:30 +00:00
Baligh Uddin
367dc2bf27 am 561ffd24: (-s ours) am fe74cdcc: (-s ours) am 0a4bd7c9: (-s ours) am f3183062: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '561ffd248fe67d9e583dd1b5dbf3deb7b02a394b':
  Import translations. DO NOT MERGE
 2014-03-25 23:01:28 +00:00