OSDN Git Service

android-x86/frameworks-base.git
10 years agoAdd PowerManager method to assign blame to a single uid
Marco Nelissen [Thu, 3 Oct 2013 15:49:36 +0000 (08:49 -0700)]
Add PowerManager method to assign blame to a single uid

Currently used by audioflinger to account for recording wakelocks.
b/10985160

Change-Id: I18fc8487f2a197bf02b5269a4bcae9e75b6c2207

10 years agoMerge "Prevent authenticators from using Settings to launch arbitrary activities...
Carlos Valdivia [Mon, 30 Sep 2013 17:35:45 +0000 (17:35 +0000)]
Merge "Prevent authenticators from using Settings to  launch arbitrary activities." into klp-dev

10 years agoMerge "Add android.provider.Telephony to public API." into klp-dev
Jake Hamby [Mon, 30 Sep 2013 17:18:51 +0000 (17:18 +0000)]
Merge "Add android.provider.Telephony to public API." into klp-dev

10 years agoMerge "Fix configuration changes in status bars." into klp-dev
Daniel Sandler [Mon, 30 Sep 2013 15:02:43 +0000 (15:02 +0000)]
Merge "Fix configuration changes in status bars." into klp-dev

10 years agoFix configuration changes in status bars.
Daniel Sandler [Mon, 30 Sep 2013 14:21:45 +0000 (10:21 -0400)]
Fix configuration changes in status bars.

- Make sure SystemBars calls onConfigurationChanged on the
  status bar
- Remove redundant ACTION_CONFIGURATION_CHANGED receiver in
  BaseStatusBar & move this code into onConfigurationChanged
- Force locale refresh even if a configuration change
  touches only the layout direction

Bug: 10113357
Change-Id: I92902d25cbae77f2558cfb85482484b11dc7294e

10 years agoMerge "Fix issue #10948509: Crash in procstats when there is no data" into klp-dev
Dianne Hackborn [Mon, 30 Sep 2013 00:21:48 +0000 (00:21 +0000)]
Merge "Fix issue #10948509: Crash in procstats when there is no data" into klp-dev

10 years agoFix issue #10948509: Crash in procstats when there is no data
Dianne Hackborn [Thu, 26 Sep 2013 18:07:17 +0000 (11:07 -0700)]
Fix issue #10948509: Crash in procstats when there is no data

Not dealing with the case where there is a null list.

Also fixed some bugs I found while looking at this:

- When resetting the stats, we would use a newly computed time stamp
  for the total durations rather than the one we used to reset the
  proc/service entries.  This would result in them being able to be
  slightly > 100%.
- There was a bug in how we split a single process state into its
  per-package representation, where we would but the cloned process
  state into the new package's entry (instead of properly for its
  own package entry), to be immediately overwritten by the new
  process state we make for that package.  This could result in
  bad data for processes that have multiple packages.
- There was a bug in resetting service stats, where we wouldn't
  update the overall run timestamp, allowing that time to sometimes
  be > 100%.
- There was a bug in computing pss data for processes with multiple
  packages, where the pss data was not distributed across all of the
  activity per-package process states.
- There was a bug in computing the zram information that would cause
  it to compute the wrong value, and then never be displayed.

Finally a little code refactoring so that ProcessState and ServiceState
can now share a common implementation for the table of duration values.

Change-Id: I5e0f4e9107829b81f395dad9419c33257b4f8902

10 years agoMerge "Printers in the list of printers change position." into klp-dev
Svetoslav Ganov [Sun, 29 Sep 2013 17:26:46 +0000 (17:26 +0000)]
Merge "Printers in the list of printers change position." into klp-dev

10 years agoMerge "Ensure correct window ordering." into klp-dev
Craig Mautner [Sun, 29 Sep 2013 14:26:11 +0000 (14:26 +0000)]
Merge "Ensure correct window ordering." into klp-dev

10 years agoMerge "Don't kill home process with the rest of its package." into klp-dev
Craig Mautner [Sun, 29 Sep 2013 14:25:08 +0000 (14:25 +0000)]
Merge "Don't kill home process with the rest of its package." into klp-dev

10 years agoMerge "Remove home package name methods." into klp-dev
Craig Mautner [Sun, 29 Sep 2013 14:24:27 +0000 (14:24 +0000)]
Merge "Remove home package name methods." into klp-dev

10 years agoPrevent authenticators from using Settings to launch arbitrary activities.
Carlos Valdivia [Sun, 29 Sep 2013 12:11:56 +0000 (05:11 -0700)]
Prevent authenticators from using Settings to  launch arbitrary activities.

Various authenticator results such as getAuthToken and addAccount might
result in an Intent returned to the AccountManager caller. A malicious
authenticator could exploit the fact that the Settings are a system app,
lead the user to launch add account for their account type and thus get
Settings to use the intent to start some arbitrary third parties Activity.

The fix is to make sure that the UID of the app associated with Activity
to be launched by the supplied intent and the Authenticators UID share
the same signature.  This means that an authenticator implementer can only
exploit apps they control.

Bug: 7699048
Change-Id: I34330454c341e6a8422ca1ed3b390466a0feedce

10 years agoEnsure correct window ordering.
Craig Mautner [Sat, 28 Sep 2013 22:58:38 +0000 (15:58 -0700)]
Ensure correct window ordering.

Make sure that moveStackWindowsLocked() is called every time that the
stack ordering changes. This will rebuild the window list. Previously
the call was being made after the moveStack() call which got forgotten
in the addAppToken() causing the home stack to obscure incoming phone
and video calls.

Fixes bug 10023223.
Fixes bug 10678010.
Maybe fixes bug 10858941.

Change-Id: I59922dc979a19210008eac1f528704984c63c886

10 years agoRemove home package name methods.
Craig Mautner [Sat, 28 Sep 2013 19:35:25 +0000 (12:35 -0700)]
Remove home package name methods.

Do not use the shortcut of the package name to identify the home
activity.

Fixes bug 10963726.
Fixes bug 10920950.

Change-Id: I725781a26672b055a816994aee6ea458a7f07c88

10 years agoDon't kill home process with the rest of its package.
Craig Mautner [Sat, 28 Sep 2013 20:46:38 +0000 (13:46 -0700)]
Don't kill home process with the rest of its package.

Killing the GEL search results was killing everything in its package.
This fix keeps the home process from being killed when a task in its
package is killed.

Fixes bug 10927223.

Change-Id: I56e75f0a0118885a1604cbd70320bbdb4f8cf1a2

10 years agoPrinters in the list of printers change position.
Svetoslav Ganov [Sat, 28 Sep 2013 19:09:23 +0000 (12:09 -0700)]
Printers in the list of printers change position.

While the logic was correct the array map that holds the list of pritners
does not keep the position of the items constant. Switched to linked hash
map which gives this guarantee.

bug:10955751

Change-Id: Idbbe14d753e6a1ad1002f2289b10cb62d7f9f040

10 years agoMerge "Ignore historical printer records for installed services" into klp-dev
Svetoslav [Sat, 28 Sep 2013 02:18:33 +0000 (02:18 +0000)]
Merge "Ignore historical printer records for installed services" into klp-dev

10 years agoKeyguard transport controls: fullscreen art
Adam Powell [Sat, 28 Sep 2013 00:43:53 +0000 (17:43 -0700)]
Keyguard transport controls: fullscreen art

When the transport controls are active, set the relevant art as a
fullscreen background for the keyguard.

Change-Id: I1e8a87f242153a2a2c5bf94dbd15f0fd3e07dde3

10 years agoIgnore historical printer records for installed services
Svetoslav [Sat, 28 Sep 2013 01:29:53 +0000 (18:29 -0700)]
Ignore historical printer records for installed services

When loading historical records for previously used printers we
now ignore the ones whose target print service is not installed.

bug:10955652

Change-Id: Ib295e7d88ed3c308ef6d8a11bdc1792ebbb6d526

10 years agoMerge "Fix missing transport in keyguard" into klp-dev
Jim Miller [Sat, 28 Sep 2013 01:30:20 +0000 (01:30 +0000)]
Merge "Fix missing transport in keyguard" into klp-dev

10 years agoMerge "Fix permissions on WindowManagerService.showAssistant()" into klp-dev
Jim Miller [Sat, 28 Sep 2013 01:18:17 +0000 (01:18 +0000)]
Merge "Fix permissions on WindowManagerService.showAssistant()" into klp-dev

10 years agoFix missing transport in keyguard
Jim Miller [Fri, 27 Sep 2013 01:11:38 +0000 (18:11 -0700)]
Fix missing transport in keyguard

Keyguard wasn't re-establishing a connection to the RCD after a
crash.  This results in a missing transport until the session reboots.

Fixes bug 10204949

Change-Id: Ia030eacbcf1e3cfa9ee948c841c95d2040f9c1e0

10 years agoMerge "Print job files and print job records not always cleaned up." into klp-dev
Svetoslav Ganov [Sat, 28 Sep 2013 01:06:51 +0000 (01:06 +0000)]
Merge "Print job files and print job records not always cleaned up." into klp-dev

10 years agoMerge "Centralize handleAppDied and fix return to home." into klp-dev
Craig Mautner [Sat, 28 Sep 2013 00:43:56 +0000 (00:43 +0000)]
Merge "Centralize handleAppDied and fix return to home." into klp-dev

10 years agoMerge "Add badging of Payment apps" into klp-dev
Adam Lesinski [Sat, 28 Sep 2013 00:36:29 +0000 (00:36 +0000)]
Merge "Add badging of Payment apps" into klp-dev

10 years agoMerge "Add support for dumping new badging" into klp-dev
Adam Lesinski [Sat, 28 Sep 2013 00:31:33 +0000 (00:31 +0000)]
Merge "Add support for dumping new badging" into klp-dev

10 years agoMerge "Adding a timeout for waiting to get the selected printer's capabilities."...
Svetoslav Ganov [Sat, 28 Sep 2013 00:28:07 +0000 (00:28 +0000)]
Merge "Adding a timeout for waiting to get the selected printer's capabilities." into klp-dev

10 years agoMerge "New roots UX, async, performance, docs." into klp-dev
Jeff Sharkey [Sat, 28 Sep 2013 00:27:29 +0000 (00:27 +0000)]
Merge "New roots UX, async, performance, docs." into klp-dev

10 years agoPrint job files and print job records not always cleaned up.
Svetoslav Ganov [Fri, 27 Sep 2013 17:48:31 +0000 (10:48 -0700)]
Print job files and print job records not always cleaned up.

1. We want the files for a print job to be removed as early as possible
   typically because the print job was cancelled, completed, the app
   or the spooler crashed during print job construction. We were keeping
   around in the spooler and hence to disc infos for jobs that are in
   final state since the app that created them may hold a reference to
   a local print job objec whose info it can access to get the latest
   print job state potentially after the job reached final state. The
   issue was that we were persisting to disc created print jobs which
   were during construction which requires careful handling for the
   various cases above. This is tricky and error prone.

   We used to tell the spooler to forget the print jobs infos when the
   app that created them died. The implementation to forget a print
   job was not careful and was nuking currently running print jobs in
   addition to the ones in a terminal state. Further, if the app dies
   before a print job is completed we were left with a stale print
   job in the spooler since we missed the signal to forget it (assuming
   we forget only inactive jobs). These issues suggest that the approach
   is problematic.

   Now we have a cache of print job infos for the jobs an app created.
   This cache is updated when the state of a print jobs changes using
   the new print job state observation code. When the app dies we
   remove the cached jobs for that app. Now if the app calls to get
   the print jobs it gets the cached ones, i.e. the print jobs it
   created during its lifetime, plus the print jobs that are still
   active fetched from the spooler. Note that transient state cannot
   be kept in the spooler since we unbind from it if there is no
   work and it may get killed.

2. Improved the print sub-system logging code to show the cached
   print job infos for apps and also dump the print job PDF file
   names.

bug:10958357

Change-Id: I6f7c1968b6b7ba5be182a10df044ff7ea1fc3a61

10 years agoMerge "Add missing constructor parameter to KeyEvent" into klp-dev
Michael Wright [Sat, 28 Sep 2013 00:26:29 +0000 (00:26 +0000)]
Merge "Add missing constructor parameter to KeyEvent" into klp-dev

10 years agoNew roots UX, async, performance, docs.
Jeff Sharkey [Fri, 27 Sep 2013 23:44:11 +0000 (16:44 -0700)]
New roots UX, async, performance, docs.

Yet another iteration from UX on how roots should be ordered.  Since
we no longer categorize by type, remove from public API.  Updated
asset drop with new dividers.

Update public API docs to be explicit about required columns.  Hide
flags and columns that aren't required for third-party apps.

Move remainder of potentially blocking work to AsyncTasks, including
creating directories, picked root resolution, and creation of new
documents once picked.

Improve performance of layouts by removing baseline alignment and
reduce hierarchy depth.  Set alpha on ImageViews directly to avoid
offscreen rendering hit.

Limit returned recents to 45 days.  Show load in recents when still
waiting for backends.  Show empty message when no recents stacks to
create from.  Use unique key when saving recent stacks.

Bug: 10941423108194541096441210960718
Change-Id: I08cf589dcda7e203acf67928f4d30322ae36ee94

10 years agoCentralize handleAppDied and fix return to home.
Craig Mautner [Sat, 28 Sep 2013 00:02:21 +0000 (17:02 -0700)]
Centralize handleAppDied and fix return to home.

The home activity was being returned to when any activity in a task
that was launched from home crashed. If there were still activities
left in the task then the crash should have brought up those
activities next, not home.

This may be a partial fix for crashes where the back stack was showing
up under launcher icons. Bug 10858941.

Change-Id: I840a25bd8395bfce46f4e21b112d78b12884706d

10 years agoMerge "Camera2: remove CameraDevice#getProperties" into klp-dev
Zhijun He [Fri, 27 Sep 2013 23:58:27 +0000 (23:58 +0000)]
Merge "Camera2: remove CameraDevice#getProperties" into klp-dev

10 years agoFix permissions on WindowManagerService.showAssistant()
Jim Miller [Thu, 19 Sep 2013 22:50:11 +0000 (15:50 -0700)]
Fix permissions on WindowManagerService.showAssistant()

Since binder call permissions are not transitive by design,
the proper way to fix this is to have the call talk directly
to keyguard from the navigation bar.

Fixes bug 9409008

Change-Id: Ibd90a79bb638c969b514455a2ad93c6ff668222d

10 years agoam 584d4f69: am 57177492: am 4a9999f1: remove Remembering Your Users class from nav...
Scott Main [Fri, 27 Sep 2013 23:04:16 +0000 (16:04 -0700)]
am 584d4f69: am 57177492: am 4a9999f1: remove Remembering Your Users class from nav. Separate CL will redirect these pages to the Google Auth doc.

* commit '584d4f69e2f8e904f50169ad223b244de72aa5ed':
  remove Remembering Your Users class from nav. Separate CL will redirect these pages to the Google Auth doc.

10 years agoam 01c2e173: (-s ours) am 49039929: am 49eb1d95: am d084cc44: am 4f59a921: am 12fd0f1...
Amith Yamasani [Fri, 27 Sep 2013 22:58:08 +0000 (15:58 -0700)]
am 01c2e173: (-s ours) am 49039929: am 49eb1d95: am d084cc44: am 4f59a921: am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate

* commit '01c2e173d99cf4dd1c91cacb9b461082091cbeb3':
  Don't instantiate non-Fragments in Fragment.instantiate

10 years agoam afd85f82: am c6d085a5: am 37453a83: Merge "Docs: Changed" into jb-mr2-docs
David Friedman [Fri, 27 Sep 2013 22:58:05 +0000 (15:58 -0700)]
am afd85f82: am c6d085a5: am 37453a83: Merge "Docs: Changed" into jb-mr2-docs

* commit 'afd85f820e032e12887c820883bf1f7d1df14374':
  Docs: Changed

10 years agoam f0a5a844: am 165489da: am 2fe85a10: Merge "Docs: "radio button"->"checkbox" in...
David Friedman [Fri, 27 Sep 2013 22:58:02 +0000 (15:58 -0700)]
am f0a5a844: am 165489da: am 2fe85a10: Merge "Docs: "radio button"->"checkbox" in "Tip" at bottom of doc Bug: 10641902" into jb-mr2-docs

* commit 'f0a5a844a94e3eec386b8fb08d7b405e1e95ed6f':
  Docs: "radio button"->"checkbox" in "Tip" at bottom of doc Bug: 10641902

10 years agoam ff379fc4: am 707bac2b: am 0b1cfc1f: Merge "Docs: In the section "Determine if...
David Friedman [Fri, 27 Sep 2013 22:57:59 +0000 (15:57 -0700)]
am ff379fc4: am 707bac2b: am 0b1cfc1f: Merge "Docs: In the section "Determine if You Have an Internet Connection," I added to the code snippet so that it also checks whether activeNetwork is null. Bug: 10797360" into jb-mr2-docs

* commit 'ff379fc45c70ab92e6b5422646c9aa67a86002e0':
  Docs: In the section "Determine if You Have an Internet Connection," I added to the code snippet so that it also checks whether activeNetwork is null. Bug: 10797360

10 years agoam 233a341b: am 1b8e3197: am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPoo...
David Friedman [Fri, 27 Sep 2013 22:57:56 +0000 (15:57 -0700)]
am 233a341b: am 1b8e3197: am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs

* commit '233a341b6d9477f7f41d5a954fa7f7a150972ccb':
  Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994

10 years agoam 657343d7: am b648f950: am 23bd5927: Docs: Fixed a typo, such that "C+++"-->"C...
David Friedman [Fri, 27 Sep 2013 22:57:53 +0000 (15:57 -0700)]
am 657343d7: am b648f950: am 23bd5927: Docs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to be another file with extra apostrophes, but it looks like that one had already been fixed. Bug: 10796099

* commit '657343d782b5ddd8144c724d9131d3f51f39cd8c':
  Docs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to be another file with extra apostrophes, but it looks like that one had already been fixed. Bug: 10796099

10 years agoMerge "Make SubtitleController thread safe" into klp-dev
Lajos Molnar [Fri, 27 Sep 2013 22:57:22 +0000 (22:57 +0000)]
Merge "Make SubtitleController thread safe" into klp-dev

10 years agoam 57177492: am 4a9999f1: remove Remembering Your Users class from nav. Separate...
Scott Main [Fri, 27 Sep 2013 22:36:28 +0000 (15:36 -0700)]
am 57177492: am 4a9999f1: remove Remembering Your Users class from nav. Separate CL will redirect these pages to the Google Auth doc.

* commit '571774922ce5ace09c746fdb83cbdce243dad3e4':
  remove Remembering Your Users class from nav. Separate CL will redirect these pages to the Google Auth doc.

10 years agoam 4a9999f1: remove Remembering Your Users class from nav. Separate CL will redirect...
Scott Main [Fri, 27 Sep 2013 22:33:18 +0000 (15:33 -0700)]
am 4a9999f1: remove Remembering Your Users class from nav. Separate CL will redirect these pages to the Google Auth doc.

* commit '4a9999f1ad20830df4aa38d3d3a42d73cb9986f0':
  remove Remembering Your Users class from nav. Separate CL will redirect these pages to the Google Auth doc.

10 years agoremove Remembering Your Users class from nav.
Scott Main [Fri, 27 Sep 2013 22:24:35 +0000 (15:24 -0700)]
remove Remembering Your Users class from nav.
Separate CL will redirect these pages to the Google Auth doc.

Change-Id: Ib47b8e0fffbe776626b463c1199f435a82e64170

10 years agoMake SubtitleController thread safe
Lajos Molnar [Fri, 20 Sep 2013 15:45:31 +0000 (08:45 -0700)]
Make SubtitleController thread safe

Add the concept of an anchor looper.
Allow show/hide/selectTrack/selectDefaultTrack to be called from thread
other than anchor looper.

Change-Id: Iaf2f3d3c46d1b00a0a24156745ec16b301c80c04
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10919206

10 years agoCamera2: remove CameraDevice#getProperties
Zhijun He [Fri, 27 Sep 2013 20:43:25 +0000 (13:43 -0700)]
Camera2: remove CameraDevice#getProperties

Also cleanup some unnecessary imports.

Bug: 10360518
Change-Id: Id54aa4c9e3dff2bd354e3ebb83687b000842ea3f

10 years agoAdd missing constructor parameter to KeyEvent
Michael Wright [Fri, 27 Sep 2013 21:03:13 +0000 (14:03 -0700)]
Add missing constructor parameter to KeyEvent

When in the SyntheticKeyHandler, a missing constructor paramater caused the
wrong contstructor to be called. This would cause the device id, scan code and
flags to be incorrect.

Bug: 10966229
Change-Id: Ib84ef88d28c0da517b376c5493a851cf8fe0a9f7

10 years agoFix for jank when fast-scrolling DeskClock's world cities list in RTL
Raph Levien [Fri, 27 Sep 2013 20:36:24 +0000 (13:36 -0700)]
Fix for jank when fast-scrolling DeskClock's world cities list in RTL

This is a fix for bug 10863979.

The onPreDraw() method in TextView was canceling the draw every time a
the horizontal scroll changed. These dropped frames were visible as
jank. The fix is to never cancel the draw. It seems likely that the
previous rationale for canceling draw is no longer valid, due to other
fixes, because the scroll state will have been fully updated.

Change-Id: I8c2da5450723f993055a49b1cb57320c08f2a11e

10 years agoam 49039929: am 49eb1d95: am d084cc44: am 4f59a921: am 12fd0f16: am f6a0c116: am...
Amith Yamasani [Fri, 27 Sep 2013 18:55:34 +0000 (11:55 -0700)]
am 49039929: am 49eb1d95: am d084cc44: am 4f59a921: am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate

* commit '490399292d2160cf94231df7a9e07e8aa8237489':
  Don't instantiate non-Fragments in Fragment.instantiate

10 years agoam 49eb1d95: am d084cc44: am 4f59a921: am 12fd0f16: am f6a0c116: am 9bf1a139: am...
Amith Yamasani [Fri, 27 Sep 2013 18:51:09 +0000 (11:51 -0700)]
am 49eb1d95: am d084cc44: am 4f59a921: am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate

* commit '49eb1d958198b2a88455c340c9d072469d065785':
  Don't instantiate non-Fragments in Fragment.instantiate

10 years agoam d084cc44: am 4f59a921: am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am...
Amith Yamasani [Fri, 27 Sep 2013 18:46:29 +0000 (11:46 -0700)]
am d084cc44: am 4f59a921: am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate

* commit 'd084cc44eb59407c851399d548256c145eb45342':
  Don't instantiate non-Fragments in Fragment.instantiate

10 years agoam 4f59a921: am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am...
Amith Yamasani [Fri, 27 Sep 2013 18:31:18 +0000 (11:31 -0700)]
am 4f59a921: am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate

* commit '4f59a9216e76207a7003bfe010076aa78eee629a':
  Don't instantiate non-Fragments in Fragment.instantiate

10 years agoam 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don...
Amith Yamasani [Fri, 27 Sep 2013 18:25:20 +0000 (11:25 -0700)]
am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate

* commit '12fd0f1644b28b6938a504492397e8ca8d38a1c5':
  Don't instantiate non-Fragments in Fragment.instantiate

10 years agoam f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate...
Amith Yamasani [Fri, 27 Sep 2013 18:23:08 +0000 (11:23 -0700)]
am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate

* commit 'f6a0c11615bd5c2c934527a0b20ba13f958913c4':
  Don't instantiate non-Fragments in Fragment.instantiate

10 years agoAdd badging of Payment apps
Adam Lesinski [Fri, 27 Sep 2013 18:14:57 +0000 (11:14 -0700)]
Add badging of Payment apps

HCE apps that declare themselves as payment apps will receive
that badge when running aapt dump badging.

bug:10899864
Change-Id: I7c095214412465ad7a925285d6167e12de16b600

10 years agoam 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments...
Amith Yamasani [Fri, 27 Sep 2013 18:20:20 +0000 (11:20 -0700)]
am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate

* commit '9bf1a1394852ad773d590d1cc60c5e50be8cb1b9':
  Don't instantiate non-Fragments in Fragment.instantiate

10 years agoam 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment...
Amith Yamasani [Fri, 27 Sep 2013 18:17:57 +0000 (11:17 -0700)]
am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate

* commit '72c5e376879fb72548ef2a1c8d5b063853d174ee':
  Don't instantiate non-Fragments in Fragment.instantiate

10 years agoam ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
Amith Yamasani [Fri, 27 Sep 2013 18:14:23 +0000 (11:14 -0700)]
am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate

* commit 'ba1ae3af76466b94efedf06c4efac365fd7b9300':
  Don't instantiate non-Fragments in Fragment.instantiate

10 years agoAdd support for dumping new badging
Adam Lesinski [Thu, 26 Sep 2013 00:03:50 +0000 (17:03 -0700)]
Add support for dumping new badging

APKs with AccessibilityServices, PrintServices, and or DeviceAdmin
will have those services dumped when running 'aapt dump badging'.

bug:10899864
Change-Id: I9c1f1f36c397b128dca802510368573a54977459

10 years agoam 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
Amith Yamasani [Fri, 27 Sep 2013 18:10:36 +0000 (11:10 -0700)]
am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate

* commit '427864188dfc5dd803b15797379b9dc6673abd16':
  Don't instantiate non-Fragments in Fragment.instantiate

10 years agoMerge "Add warning about using MergeCursor in CursorAdapter" into klp-dev
Alan Viverette [Fri, 27 Sep 2013 18:03:47 +0000 (18:03 +0000)]
Merge "Add warning about using MergeCursor in CursorAdapter" into klp-dev

10 years agoam c6d085a5: am 37453a83: Merge "Docs: Changed" into jb-mr2-docs
David Friedman [Fri, 27 Sep 2013 17:37:27 +0000 (10:37 -0700)]
am c6d085a5: am 37453a83: Merge "Docs: Changed" into jb-mr2-docs

* commit 'c6d085a5179311ba3d7395360e6e427fa4fb076c':
  Docs: Changed

10 years agoam 165489da: am 2fe85a10: Merge "Docs: "radio button"->"checkbox" in "Tip" at bottom...
David Friedman [Fri, 27 Sep 2013 17:37:22 +0000 (10:37 -0700)]
am 165489da: am 2fe85a10: Merge "Docs: "radio button"->"checkbox" in "Tip" at bottom of doc Bug: 10641902" into jb-mr2-docs

* commit '165489da28ff5b77d84095461934e86da8591f85':
  Docs: "radio button"->"checkbox" in "Tip" at bottom of doc Bug: 10641902

10 years agoam 707bac2b: am 0b1cfc1f: Merge "Docs: In the section "Determine if You Have an Inter...
David Friedman [Fri, 27 Sep 2013 17:37:12 +0000 (10:37 -0700)]
am 707bac2b: am 0b1cfc1f: Merge "Docs: In the section "Determine if You Have an Internet Connection," I added to the code snippet so that it also checks whether activeNetwork is null. Bug: 10797360" into jb-mr2-docs

* commit '707bac2bdc40e3d98957e134331279534adf8e70':
  Docs: In the section "Determine if You Have an Internet Connection," I added to the code snippet so that it also checks whether activeNetwork is null. Bug: 10797360

10 years agoam 1b8e3197: am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed...
David Friedman [Fri, 27 Sep 2013 17:37:07 +0000 (10:37 -0700)]
am 1b8e3197: am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs

* commit '1b8e319784a1bb166aaa6b0f1dc306f8d4b6e57f':
  Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994

10 years agoam b648f950: am 23bd5927: Docs: Fixed a typo, such that "C+++"-->"C++"; there was...
David Friedman [Fri, 27 Sep 2013 17:33:15 +0000 (10:33 -0700)]
am b648f950: am 23bd5927: Docs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to be another file with extra apostrophes, but it looks like that one had already been fixed. Bug: 10796099

* commit 'b648f9509b17bad806c907ffa5270901a86e6c06':
  Docs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to be another file with extra apostrophes, but it looks like that one had already been fixed. Bug: 10796099

10 years agoam 37453a83: Merge "Docs: Changed" into jb-mr2-docs
David Friedman [Fri, 27 Sep 2013 17:30:09 +0000 (10:30 -0700)]
am 37453a83: Merge "Docs: Changed" into jb-mr2-docs

* commit '37453a8353a190233c94c9f40261feef6a9ebf08':
  Docs: Changed

10 years agoam 2fe85a10: Merge "Docs: "radio button"->"checkbox" in "Tip" at bottom of doc Bug...
David Friedman [Fri, 27 Sep 2013 17:30:06 +0000 (10:30 -0700)]
am 2fe85a10: Merge "Docs: "radio button"->"checkbox" in "Tip" at bottom of doc Bug: 10641902" into jb-mr2-docs

* commit '2fe85a10abcb216dded99792466124f7f80574f2':
  Docs: "radio button"->"checkbox" in "Tip" at bottom of doc Bug: 10641902

10 years agoam 0b1cfc1f: Merge "Docs: In the section "Determine if You Have an Internet Connectio...
David Friedman [Fri, 27 Sep 2013 17:30:03 +0000 (10:30 -0700)]
am 0b1cfc1f: Merge "Docs: In the section "Determine if You Have an Internet Connection," I added to the code snippet so that it also checks whether activeNetwork is null. Bug: 10797360" into jb-mr2-docs

* commit '0b1cfc1fb64a1b24f107abf106eb839287f65cfb':
  Docs: In the section "Determine if You Have an Internet Connection," I added to the code snippet so that it also checks whether activeNetwork is null. Bug: 10797360

10 years agoam 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in...
David Friedman [Fri, 27 Sep 2013 17:30:01 +0000 (10:30 -0700)]
am 8c38ea39: Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs

* commit '8c38ea39203016dde95bc5dd68f27f6f45096784':
  Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994

10 years agoDon't instantiate non-Fragments in Fragment.instantiate
Amith Yamasani [Thu, 26 Sep 2013 23:14:36 +0000 (16:14 -0700)]
Don't instantiate non-Fragments in Fragment.instantiate

Backport...

Fix for PreferenceActivities being invoked with non-Fragment class
names via extras in the intent. Make sure that the constructor
doesn't get called if the class name is not for a Fragment type.
Bug: 9901133
Change-Id: I227756fb4246deac796cee09077e482237bb5b0d

10 years agoam 23bd5927: Docs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to...
David Friedman [Fri, 27 Sep 2013 17:26:23 +0000 (10:26 -0700)]
am 23bd5927: Docs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to be another file with extra apostrophes, but it looks like that one had already been fixed. Bug: 10796099

* commit '23bd5927f1c82f3f63288fbee4e7c460fca3dc4e':
  Docs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to be another file with extra apostrophes, but it looks like that one had already been fixed. Bug: 10796099

10 years agoMerge "Docs: Changed" into jb-mr2-docs
David Friedman [Fri, 27 Sep 2013 17:25:42 +0000 (17:25 +0000)]
Merge "Docs: Changed" into jb-mr2-docs

10 years agoMerge "Docs: "radio button"->"checkbox" in "Tip" at bottom of doc Bug: 10641902"...
David Friedman [Fri, 27 Sep 2013 17:25:29 +0000 (17:25 +0000)]
Merge "Docs: "radio button"->"checkbox" in "Tip" at bottom of doc Bug: 10641902" into jb-mr2-docs

10 years agoMerge "Docs: In the section "Determine if You Have an Internet Connection," I added...
David Friedman [Fri, 27 Sep 2013 17:25:16 +0000 (17:25 +0000)]
Merge "Docs: In the section "Determine if You Have an Internet Connection," I added to the code snippet so that it also checks whether activeNetwork is null. Bug: 10797360" into jb-mr2-docs

10 years agoMerge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file...
David Friedman [Fri, 27 Sep 2013 17:24:41 +0000 (17:24 +0000)]
Merge "Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file. Bug: 10807931 10796994" into jb-mr2-docs

10 years agoDocs: Fixed wrong parameter in SoundPool file; fixed typo in security file.
David Friedman [Fri, 27 Sep 2013 17:04:48 +0000 (10:04 -0700)]
Docs: Fixed wrong parameter in SoundPool file; fixed typo in security file.
Bug: 10807931 10796994

Change-Id: I8c8e07c3e8606d5983c2545fa6638af45650d27c

10 years agoAdding a timeout for waiting to get the selected printer's capabilities.
Svetoslav Ganov [Fri, 27 Sep 2013 04:12:47 +0000 (21:12 -0700)]
Adding a timeout for waiting to get the selected printer's capabilities.

A print service may choose to provide only the printer info and then when
it is requested to start tracking the state of the printer, the service
should provide the printer capabilities. If the capabilities are not
received within ten seconds we mark the printer as unavailable and stop
tracking it.

bug:10748639

Change-Id: I9171cb5dc116fd321c23a8e4ab55109448e2fc6a

10 years agoMerge "API cleanups for Notification." into klp-dev
Daniel Sandler [Fri, 27 Sep 2013 16:08:45 +0000 (16:08 +0000)]
Merge "API cleanups for Notification." into klp-dev

10 years agoAPI cleanups for Notification.
Daniel Sandler [Mon, 23 Sep 2013 17:35:35 +0000 (13:35 -0400)]
API cleanups for Notification.

- Calling build() on a Style now goes through the same
  codepath as calling build() on the Builder.
- Documented new constants and unhidden classes.
- Fixed crash in Action.clone().

Bug: 10112103
Bug: 10461196
Change-Id: I08cd94790b538a361ccf8ff3682f6a86a7812b95

10 years agoMerge "Remove unused views when we return to keyguard" into klp-dev
John Spurlock [Fri, 27 Sep 2013 14:32:38 +0000 (14:32 +0000)]
Merge "Remove unused views when we return to keyguard" into klp-dev

10 years agoMerge "Restore scrim views to former place in view hierarchy." into klp-dev
John Spurlock [Fri, 27 Sep 2013 14:27:38 +0000 (14:27 +0000)]
Merge "Restore scrim views to former place in view hierarchy." into klp-dev

10 years agoRestore scrim views to former place in view hierarchy.
John Spurlock [Thu, 26 Sep 2013 16:14:33 +0000 (12:14 -0400)]
Restore scrim views to former place in view hierarchy.

By enabling KeyguardHostView to extend into the full screen area
and updating custom measure/layout in the Challenge layouts
appropriately.

Bug:10939005
Change-Id: I06fb187c4100cf0f2e48b1206cc4450afa4567dd

10 years agoDocs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to be another file...
David Friedman [Fri, 27 Sep 2013 05:30:11 +0000 (22:30 -0700)]
Docs: Fixed a typo, such that "C+++"-->"C++"; there was supposed to be another file with extra apostrophes, but it looks like that one had already been fixed.
Bug: 10796099

Change-Id: Ideb1dbf70b9034e88683ef19ec1a3d338b7ea06b

10 years agoMerge "Fix conflicting/unclear documentation in InputConnection." into klp-dev
Jean Chalard [Fri, 27 Sep 2013 03:11:41 +0000 (03:11 +0000)]
Merge "Fix conflicting/unclear documentation in InputConnection." into klp-dev

10 years agoMerge "Would you like a dessert?" into klp-dev
Daniel Sandler [Fri, 27 Sep 2013 03:10:37 +0000 (03:10 +0000)]
Merge "Would you like a dessert?" into klp-dev

10 years agoMerge "Make directories always enabled, for realz." into klp-dev
Jeff Sharkey [Fri, 27 Sep 2013 02:55:04 +0000 (02:55 +0000)]
Merge "Make directories always enabled, for realz." into klp-dev

10 years agoMake directories always enabled, for realz.
Jeff Sharkey [Fri, 27 Sep 2013 02:42:52 +0000 (19:42 -0700)]
Make directories always enabled, for realz.

Bug: 10946731
Change-Id: I3eb132c53e47f31d1d1723ed2262823b54b1fce0

10 years agoMerge "Printers in the list of printers change position." into klp-dev
Svetoslav [Fri, 27 Sep 2013 02:24:38 +0000 (02:24 +0000)]
Merge "Printers in the list of printers change position." into klp-dev

10 years agoPrinters in the list of printers change position.
Svetoslav [Thu, 26 Sep 2013 22:55:47 +0000 (15:55 -0700)]
Printers in the list of printers change position.

1. The printers in the printers list of settings change position if
   they are updated. The settings app is using hidden platform APIs
   the this change fixes.

2. Enable ProGuard for the PrintSpooler.

3. Added icons on the list of printers so the user knows which
   print service used the printer. Now the user can know when
   he is using cloud print and maybe incurring data costs vs
   local printer discovered by a vendor plug in.

bug:10955751

Change-Id: I292f48b424cb561218fdb424d0388f4d786d8339

10 years agoMerge "Dismiss keyguard when resuming visible activities" into klp-dev
Craig Mautner [Fri, 27 Sep 2013 00:46:52 +0000 (00:46 +0000)]
Merge "Dismiss keyguard when resuming visible activities" into klp-dev

10 years agoMerge "Add gravity settings to PopupWindow/ListPopupWindow/PopupMenu" into klp-dev
Adam Powell [Fri, 27 Sep 2013 00:46:09 +0000 (00:46 +0000)]
Merge "Add gravity settings to PopupWindow/ListPopupWindow/PopupMenu" into klp-dev

10 years agoDismiss keyguard when resuming visible activities
Craig Mautner [Thu, 26 Sep 2013 23:42:55 +0000 (16:42 -0700)]
Dismiss keyguard when resuming visible activities

If an activity is visible behind the keyguard when it is launched
by another activity then there would be no call to dismissKeyguard.
Because the other activity is pausing the call to dismissKeyguard
is skipped in startActivityLocked(). And because it is already
visible the call to ActivityRecord.windowsVisible() is never made and
the call to reportActivityVisibleLocked() which calls
dismissKeyguard() is also never made.

This change recognizes when an activity is resumed and visible and
calls dismissKeyguard() in that case.

Fixes bug 10732489.

Change-Id: I3de1350a55231aaa14dadc8709fd0fcf4960742c

10 years agoMerge "Make fading transitions work better" into klp-dev
Chet Haase [Fri, 27 Sep 2013 00:26:21 +0000 (00:26 +0000)]
Merge "Make fading transitions work better" into klp-dev

10 years agoDocs: In the section "Determine if You Have an Internet Connection," I added to the...
David Friedman [Fri, 27 Sep 2013 00:19:43 +0000 (17:19 -0700)]
Docs: In the section "Determine if You Have an Internet Connection," I added to the code snippet so that it also checks whether activeNetwork is null.
Bug: 10797360

Change-Id: I95344c2200cad5efb6457a9cb8fcd0e87298dcda

10 years agoMerge "Fix for Text fading on RTL app names is done at the beginning..." into klp-dev
Raph Levien [Thu, 26 Sep 2013 23:31:48 +0000 (23:31 +0000)]
Merge "Fix for Text fading on RTL app names is done at the beginning..." into klp-dev

10 years agoam ef4e5e61: am 194925f9: am a8f519ff: add Wallet Instant Buy and Google Cloud Platfo...
Scott Main [Thu, 26 Sep 2013 23:25:24 +0000 (16:25 -0700)]
am ef4e5e61: am 194925f9: am a8f519ff: add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.

* commit 'ef4e5e6182e020d0dd349848b38a33e0c33491b4':
  add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.

10 years agoMerge "Fix Sending PAC Broadcast before downloaded" into klp-dev
Jason Monk [Thu, 26 Sep 2013 23:23:18 +0000 (23:23 +0000)]
Merge "Fix Sending PAC Broadcast before downloaded" into klp-dev

10 years agoam 194925f9: am a8f519ff: add Wallet Instant Buy and Google Cloud Platform to the...
Scott Main [Thu, 26 Sep 2013 23:23:06 +0000 (16:23 -0700)]
am 194925f9: am a8f519ff: add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.

* commit '194925f9e894d35991920edbaa0681c1aea48120':
  add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.