Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
154,709 Commits 3 Branches 0 Tags
7731a99807728298cd4bbfdc8b577183199bc47e
Commit Graph

41104 Commits

Author SHA1 Message Date
Tom O'Neill
7731a99807 Fix a race where NLP consent dialog can be shown unnecessarily 
- Bug: 17908111

Change-Id: If94570861f38b922478d490599ab02cfb86adea6
 2014-10-09 11:30:49 -07:00
Eino-Ville Talvala
7e7a14c541 am eeec4b9e: am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-dev 
* commit 'eeec4b9ebc15545e59985eab29385157cbbd8e9f':
  Camera2: Docs cleanup, especially units and range
  camera2: Update docs only for legacy devices
 2014-10-09 13:04:08 +00:00
Dianne Hackborn
d83e9e4280 am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '0761b1b5ebb453a411e3289c1c972dbfddcee880':
  Put in real "code" (aka marketing) name.
 2014-10-09 13:03:21 +00:00
Jeff Sharkey
b424849533 am b01a5ba2: am 562262cc: Merge "Bring along more ApplicationInfo fields." into lmp-dev 
* commit 'b01a5ba2b7c1bc22e30d6cc16c30f8e1215701cd':
  Bring along more ApplicationInfo fields.
 2014-10-09 13:03:07 +00:00
Eino-Ville Talvala
eeec4b9ebc am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-dev 
* commit 'ef773e3569969592fb220b7ccc49dafcabfdd67a':
  Camera2: Docs cleanup, especially units and range
  camera2: Update docs only for legacy devices
 2014-10-09 03:02:35 +00:00
Dianne Hackborn
0761b1b5eb am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '89b196958fee07475765bd3c458098464ba16f2e':
  Put in real "code" (aka marketing) name.
 2014-10-09 00:14:54 +00:00
Jeff Sharkey
b01a5ba2b7 am 562262cc: Merge "Bring along more ApplicationInfo fields." into lmp-dev 
* commit '562262cc89838529316ff2f3e511c0d876b08677':
  Bring along more ApplicationInfo fields.
 2014-10-09 00:14:25 +00:00
Eino-Ville Talvala
ef773e3569 Merge changes Id09663d8,Ie88f3750 into lmp-dev 
* changes:
  Camera2: Docs cleanup, especially units and range
  camera2: Update docs only for legacy devices
 2014-10-08 18:48:31 +00:00
Eino-Ville Talvala
fd3e2892f2 Camera2: Docs cleanup, especially units and range 
- Add entries for units and range into javadoc
- Fix up existing units entries and add new ones
- Fix up range entries to be consistent for enums
- Add range entries where it makes sense
- Minor fix to javadoc gen to allow for code indentation
- Lots of edits for consistency, especially to
  available* entries.

Bug: 16525650

Change-Id: Id09663d897ec98122073e6e13719731ec0de4dad
 2014-10-08 11:28:59 -07:00
Dianne Hackborn
89b196958f Merge "Put in real "code" (aka marketing) name." into lmp-dev 2014-10-08 17:59:19 +00:00
Jeff Sharkey
7f1a57a3e7 Bring along more ApplicationInfo fields. 
When we added scan paths, we forgot to bring them along through
Parcel and copy constructor.

Bug: 17900178
Change-Id: I0ee9374f909d375768045976fd88cee7431f7d4d
 2014-10-08 10:14:53 -07:00
Jeff Brown
45bdf81a48 am e1449dfc: am 32b9f4a6: Merge "Reapply animation duration scale each time it is started." into lmp-dev 
* commit 'e1449dfc55113bc9eceb7fd74c8f66ff19a35dea':
  Reapply animation duration scale each time it is started.
 2014-10-08 05:24:37 +00:00
Jeff Brown
e1449dfc55 am 32b9f4a6: Merge "Reapply animation duration scale each time it is started." into lmp-dev 
* commit '32b9f4a650d1b8b52b85a27109f95fde030dff66':
  Reapply animation duration scale each time it is started.
 2014-10-08 05:12:57 +00:00
Dianne Hackborn
955d8d69ea Put in real "code" (aka marketing) name. 
Change-Id: Idb3976edfae37293ed75cb5b869b4b42d8042bbe
 2014-10-07 20:17:19 -07:00
Jeff Brown
32b9f4a650 Merge "Reapply animation duration scale each time it is started." into lmp-dev 2014-10-07 23:53:23 +00:00
Jeff Brown
7a08fe0e09 Reapply animation duration scale each time it is started. 
When Battery Saver mode is enabled, we set the animation duration
scale factor to 0 to effectively disable all animations.  Later
when it is disabled, we reset the animation duration scale
factor to 1.

This change ensures that we reapply the duration scale factor
whenever the animation is started instead of only applying it
once when the duration is set (usually when the animation is
created).  This ensures that the correct scale factor is applied
even when it changes after the animation has been initialized.

Previously, certain animations would continue to be suppressed
even after Battery Saver mode was disengaged.  This wasn't much
of an issue when the duration scale was initially implemented as
a developer setting but now that it is exposed via Battery Saver
the artifacts caused by this bug have become visible to users.

Bug: 17887431
Change-Id: I91ba5ca0505d02ac389a31d067e38886112fa0c8
 2014-10-07 15:55:35 -07:00
Alan Viverette
0660042a26 Merge "Mutate and apply theme if needed before caching themed drawables" into lmp-mr1-dev 2014-10-07 22:09:49 +00:00
Alan Viverette
727cae197b Mutate and apply theme if needed before caching themed drawables 
This ensures that drawables are completely separated from their cached
constant states before applying a theme. After this, we can remove the
implicit (and incomplete) mutation in the clone constructors.

Also implements missing mutate() method on ClipDrawable.

BUG: 17646144
Change-Id: If0d66b0a85724d76e0a4f506758c7ba3c0aa3410
 2014-10-07 15:08:47 -07:00
Christopher Tate
152893dd66 am 93e5e859: am ae456fd8: Merge "Accept any restored wallpaper" into lmp-dev 
* commit '93e5e859e3d2c0f4d4f47c90d370b38be4440655':
  Accept any restored wallpaper
 2014-10-07 21:59:10 +00:00
Christopher Tate
93e5e859e3 am ae456fd8: Merge "Accept any restored wallpaper" into lmp-dev 
* commit 'ae456fd894c5a41f859196016a7c49113b235eda':
  Accept any restored wallpaper
 2014-10-07 21:53:54 +00:00
Christopher Tate
ae456fd894 Merge "Accept any restored wallpaper" into lmp-dev 2014-10-07 21:50:08 +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
Andres Morales
5d62388192 am 4e558355: am 258d2221: Fix build, previous commit failed to remove an import 
* commit '4e5583554151ea95d8d573e3d64947afbc51f34f':
  Fix build, previous commit failed to remove an import
 2014-10-07 20:03:14 +00:00
Andres Morales
6ef845d34a am b4589115: am d6a2ab93: Merge "Remove dead NFC unlock code from fw/base" into lmp-dev 
* commit 'b4589115ad5ca8a98aa8f9b75296502658ae6416':
  Remove dead NFC unlock code from fw/base
 2014-10-07 20:03:09 +00:00
Adam Lesinski
f189c445b8 am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev 
* commit '1a98dd5cc7ea89793208b51983198bfbeade5ccc':
  Load shared library dependencies for AppWidgets
 2014-10-07 19:58:59 +00:00
Andres Morales
4e55835541 am 258d2221: Fix build, previous commit failed to remove an import 
* commit '258d222152a410341ddad045ce92e57dd7ab454e':
  Fix build, previous commit failed to remove an import
 2014-10-07 19:58:41 +00:00
Andres Morales
b4589115ad am d6a2ab93: Merge "Remove dead NFC unlock code from fw/base" into lmp-dev 
* commit 'd6a2ab930972d5578957ca919abd38fca074deec':
  Remove dead NFC unlock code from fw/base
 2014-10-07 19:58:36 +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
Andres Morales
258d222152 Fix build, previous commit failed to remove an import 
Bug:17883273
Change-Id: I6ef422eae83fb8b44279f1bf5a811858b791afa7
 2014-10-07 11:15:58 -07:00
Andres Morales
d6a2ab9309 Merge "Remove dead NFC unlock code from fw/base" into lmp-dev 2014-10-07 18:11:21 +00:00
Amith Yamasani
4797554ab8 am b86671f4: am 41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev 
* commit 'b86671f4b8263affaa561796862bd4149235b1d3':
  Set the default user restrictions to disallow calling and sms
 2014-10-07 17:43:08 +00:00
Amith Yamasani
b86671f4b8 am 41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev 
* commit '41bb3455e44dc8fde4569bbfd56fa20c6da8a27d':
  Set the default user restrictions to disallow calling and sms
 2014-10-07 17:33:25 +00:00
Amith Yamasani
41bb3455e4 Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev 2014-10-07 17:11:34 +00:00
Amith Yamasani
aa6634eaca Set the default user restrictions to disallow calling and sms 
When creating a user via the UI, disallow phone calls and SMS by
default. Primary user must explicitly enable it via Settings.

Bug: 17832802
Change-Id: I18cad4be8493ddc8890b5d90da2df256cb3f1ec9
 2014-10-06 18:24:32 -07:00
Christopher Tate
406abd4547 Accept any restored wallpaper 
...and let the wallpaper service & hosts figure out what to do
with it.

Bug 17677006

Change-Id: Ie5bfa549af4da178e621ffc42a759a552897d93a
 2014-10-06 18:00:51 -07:00
Jeff Sharkey
fcc059dcf0 am 1d5ef81e: am 99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-dev 
* commit '1d5ef81e29279f769d79315f2a38e747ea92e10f':
  Reduce PackageInstaller I/O pressure.
 2014-10-07 00:32:19 +00:00
Yuncheol Heo
d534b936d7 Merge "Change visibility of RecordSource into public." into lmp-mr1-dev 2014-10-07 00:29:06 +00:00
Jeff Sharkey
1d5ef81e29 am 99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-dev 
* commit '99586dc0108d0f4311c8af4d06ed113bbf40a6ee':
  Reduce PackageInstaller I/O pressure.
 2014-10-06 23:59:43 +00:00
Jeff Sharkey
99586dc010 Merge "Reduce PackageInstaller I/O pressure." into lmp-dev 2014-10-06 23:51:56 +00:00
Chris Craik
0aa69ff2ff am 1a6c41fb: am 6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev 
* commit '1a6c41fbad9c1c6725d189fdcf7dae2fe3f00b4d':
  Avoid changeBounds animations on Views that are not yet laidout
 2014-10-06 23:51:05 +00:00
Jeff Sharkey
02bd78490d Reduce PackageInstaller I/O pressure. 
When performing a restore during initial device setup, we could be
installing hundreds of packages.  Currently, we're writing all
metadata (including heavy icons) for every session mutation!  Because
we're holding the mSessions lock while writing all this heavy data,
we end up causing ANRs when apps call other PackageInstaller APIs.

This patch mitigates by moving the heavy icon data into separate
per-session PNG files, which we only persist when changed.

Bug: 17881962, 17567794
Change-Id: I4dee15d4a65a8eb65c381e6bb7477728b6cc30d2
 2014-10-06 16:38:15 -07:00
Andres Morales
052690540e Remove dead NFC unlock code from fw/base 
Bug:17883273
Change-Id: I214d141b0b9d83b5698f596087fabb1f30543606
 2014-10-06 16:04:19 -07:00
Chris Craik
1a6c41fbad am 6c9f0a01: Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev 
* commit '6c9f0a01602697aaed99f54c4db0d6296701ed43':
  Avoid changeBounds animations on Views that are not yet laidout
 2014-10-06 22:35:19 +00:00
Chris Craik
6c9f0a0160 Merge "Avoid changeBounds animations on Views that are not yet laidout" into lmp-dev 2014-10-06 22:06:23 +00:00
Chris Craik
f791703f9b Avoid changeBounds animations on Views that are not yet laidout 
bug:17683930

This means that GONE views with empty bounds don't trigger
ChangeBounds animations the first time they're shown.

Change-Id: I6503c5b0a790d3d31f7566fab27a0b12c5f61f26
 2014-10-06 14:55:17 -07: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
John Spurlock
b6f5cb3e45 am 81b96aad: am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev 
* commit '81b96aadbdc3726186c91b51465fb21ead56888a':
  Fix NPE in StrictMode handling.
 2014-10-06 19:22:44 +00:00
Dianne Hackborn
90d557b7a6 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 19:17:10 +00:00
John Spurlock
81b96aadbd am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-dev 
* commit '78cc93ec80f5dcc487db697a1f9a545890745847':
  Fix NPE in StrictMode handling.
 2014-10-06 19:16:53 +00:00