11739 Commits

Author SHA1 Message Date
Jeff Sharkey
58b699c366 am 636baa0d: Merge "Introduce revision codes for split APKs." into lmp-mr1-dev
* commit '636baa0d2451a531f8e83f5cdfc0d709989c4862':
  Introduce revision codes for split APKs.
2014-11-24 20:20:10 +00:00
Jeff Sharkey
636baa0d24 Merge "Introduce revision codes for split APKs." into lmp-mr1-dev 2014-11-24 20:16:17 +00:00
Jeff Sharkey
88d2a3c0e1 Introduce revision codes for split APKs.
Apps delivered as multiple split APKs must have identical package
names, version code, and signatures.  However, developers may want
to iterate quickly on a subset of splits without having to increment
the version code, which would require delivery of the entire app.

This change introduces "revision codes" which can vary between
split APKs belonging to the same app.  An install is valid as long
as the normal version code is identical across all splits.  Splits
can be added/removed to an app over time, but if a split is present
across an upgrade the revision code must not decrease.

Since system apps could have been updated with splits, only revert
to the built-in APKs if the version code is strictly greater than the
data version.  Also fix bug to enable inheriting from system apps
when adding splits.

Bug: 18481866
Change-Id: I34d8e14c141a8eb95c33ffe24b4e52d6af5c8260
2014-11-24 12:13:11 -08:00
Jorim Jaggi
82bb648b5a am 6b770744: Merge "Fix quick settings on Keyguard" into lmp-mr1-dev
* commit '6b77074438f191de4fcfa1f1560fb5f038cb8173':
  Fix quick settings on Keyguard
2014-11-24 20:01:19 +00:00
Jorim Jaggi
6b77074438 Merge "Fix quick settings on Keyguard" into lmp-mr1-dev 2014-11-24 19:31:30 +00:00
Jorim Jaggi
58bef33499 Fix quick settings on Keyguard
- Fix that quick settings couldn't be scrolled nor closed on Keyguard
if scrolling was needed.
- Fix jumping in unlock motion when closing both panel and QS
- Fix invalid panel height when closing both QS and panel

Bug: 18481668
Change-Id: Ifd12e29bbc64f72f0dc13b43e36b1a57df7524fa
2014-11-24 20:30:42 +01:00
John Spurlock
98a20f68e0 am 4dfce43e: Merge "QS: Update data usage over limit title." into lmp-mr1-dev
* commit '4dfce43e976a294b3b575564c855214a8e5cef58':
  QS: Update data usage over limit title.
2014-11-24 18:48:59 +00:00
John Spurlock
4dfce43e97 Merge "QS: Update data usage over limit title." into lmp-mr1-dev 2014-11-24 18:34:58 +00:00
Svet Ganov
f34896bbeb am c9f499d2: Merge "Print spooler crash when printing after a rotation." into lmp-mr1-dev
* commit 'c9f499d2f1cd598b90bfb8c13e505354555caea8':
  Print spooler crash when printing after a rotation.
2014-11-24 18:27:52 +00:00
Svet Ganov
c9f499d2f1 Merge "Print spooler crash when printing after a rotation." into lmp-mr1-dev 2014-11-24 18:23:37 +00:00
John Spurlock
beaf117889 QS: Update data usage over limit title.
Bug: 18499916
Change-Id: I468eb40cbbbef52853c52e196e458d72f103765a
2014-11-24 12:25:32 -05:00
Jorim Jaggi
fc4d8043de am f510a8a6: Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev
* commit 'f510a8a688acf08378419aae20d2be25b88a4397':
  Tint SIM images in PIN/PUK screen
2014-11-24 16:30:13 +00:00
Jorim Jaggi
f510a8a688 Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev 2014-11-24 16:26:03 +00:00
Adrian Roos
20eb594ab2 am 8a924242: Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev
* commit '8a9242428b9d631ba841c166d062f158fd64f0f6':
  Revert "Only keep user switcher bitmaps if needed"
2014-11-24 16:08:41 +00:00
Chris Wren
865c73b5f6 am 1aa63f0b: Merge "Push back notification means snooze the package." into lmp-mr1-dev
* commit '1aa63f0baf0df58ae22ecb2558a5de7cebd38654':
  Push back notification means snooze the package.
2014-11-24 16:04:00 +00:00
Adrian Roos
8a9242428b Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev 2014-11-24 16:03:56 +00:00
Chris Wren
1aa63f0baf Merge "Push back notification means snooze the package." into lmp-mr1-dev 2014-11-24 15:58:17 +00:00
Geoff Mendal
d2fd0410d9 Import translations. DO NOT MERGE
Change-Id: Ib6f35d7fd27aa2503ee0e1038e1048c989bf31af
Auto-generated-cl: translation import
2014-11-24 06:25:15 -08:00
Geoff Mendal
905e20855b Import translations. DO NOT MERGE
Change-Id: Ib51df7dd1177be11dbe75dc983866a9cfdf74511
Auto-generated-cl: translation import
2014-11-24 06:21:48 -08:00
Selim Cinek
f0fc23a141 am 962b06f9: Merge "Fixed several time related states for secondary users" into lmp-mr1-dev
* commit '962b06f9a02f08392b6f87225a314ebf39dd7a07':
  Fixed several time related states for secondary users
2014-11-24 11:57:59 +00:00
Selim Cinek
962b06f9a0 Merge "Fixed several time related states for secondary users" into lmp-mr1-dev 2014-11-24 11:52:40 +00:00
Wink Saville
4f1cce6306 am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
* commit '12c2136e556b54a717624d8479ec4650f363ce45':
  Additional changes to SubscriptionManager API as per API council.
2014-11-22 20:28:10 +00:00
Wink Saville
d09c4cad65 Additional changes to SubscriptionManager API as per API council.
bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
2014-11-22 10:08:16 -08:00
Svet Ganov
f6cd14dbc9 Print spooler crash when printing after a rotation.
1. Available printers are provided by a loader driven by the activity
   lifecycle. After a rotation of an app that does not handle rotation
   the print activity is destroyed in a delayed fashion. When another
   print task is started the loader of the destroed activity gets two
   cancellations, one when the activity is stopped and one when it is
   destroyed but when the second cancellation happens the loader has a
   bad state that it is loading while it is not and a NPE occurs.

2. If a rotation happens early before the print activity is fully initialized
   (there are asyncrconous operations that take place) we get a NPE as
   the print preview controller is not created yet.

3. A lockup of the print preview process occurs if the print print
   activity is destroyed after we initiated binding to the rendering
   service but before we receive the remote interface. In this case no
   remote service is received as exepcted since we already unbound from
   it resulting in a missed signal.

bug:18238590

Change-Id: I81817d81702f649ded97dfbab7d7bba28f22fa91
2014-11-22 09:28:38 -08:00
Winson Chung
207356efae am 71113e43: Merge "Reset the task stack instead of the view when Recents is hidden. (Bug. 18436876, Bug. 18394126, Bug. 18432310)" into lmp-mr1-dev
* commit '71113e43e768d973b3721f8fac9f9654ed159911':
  Reset the task stack instead of the view when Recents is hidden. (Bug. 18436876, Bug. 18394126, Bug. 18432310)
2014-11-21 23:19:38 +00:00
Winson Chung
71113e43e7 Merge "Reset the task stack instead of the view when Recents is hidden. (Bug. 18436876, Bug. 18394126, Bug. 18432310)" into lmp-mr1-dev 2014-11-21 23:15:04 +00:00
Amith Yamasani
108bdbc934 am efb2df69: Merge "Different messages when wiping user and not device" into lmp-mr1-dev
* commit 'efb2df698a4c2ed3d3371656cab199e5e3737fa9':
  Different messages when wiping user and not device
2014-11-21 23:00:52 +00:00
Amith Yamasani
efb2df698a Merge "Different messages when wiping user and not device" into lmp-mr1-dev 2014-11-21 22:27:17 +00:00
Winson Chung
bc571a9807 Reset the task stack instead of the view when Recents is hidden. (Bug. 18436876, Bug. 18394126, Bug. 18432310)
This will remove the need for having all the null checks in TaskStackView.
We also remove the check when launching tasks (the fail case is worse
when the activity fails to load).  And the CL also fix the header focus
animation, and an issue with tasks not getting laid out when the stack is
set again.

Change-Id: I9b4cd50d76f72ba3d16dd1b8e2d9bbf9f1f24d2b
2014-11-21 14:00:17 -08:00
Amith Yamasani
3a3d212a51 Different messages when wiping user and not device
There are 3 types of users
1. Primary - device will be wiped
2. Managed profile - profile will be removed
3. Secondary user - user will be removed

Show different messages for almost wipe and wipe in each
of these 3 cases.

Bug: 16843155
Change-Id: Icecfe520622773da9e45465bf2217e8ed38b266e
2014-11-21 13:57:48 -08:00
Chris Wren
a6d4fb60ed Push back notification means snooze the package.
Bug: 18451923
Change-Id: I90160f9d14cde12a5bc03e46e64eedf770149a90
2014-11-21 15:51:41 -05:00
Jim Miller
eab3240c78 Merge "Add multi-sim support to keyguard" into lmp-mr1-dev
automerge: 0284e5e

* commit '0284e5e49864a6e039d77210bbea0a013b0e23ec':
  Add multi-sim support to keyguard
2014-11-21 18:53:10 +00:00
Jim Miller
0284e5e498 Merge "Add multi-sim support to keyguard" into lmp-mr1-dev 2014-11-21 18:38:03 +00:00
Adrian Roos
0108d98369 am 26750711: Merge "Explicitly specify user for public mode" into lmp-mr1-dev
* commit '26750711e12900aca6c7c35556b4548038cfb505':
  Explicitly specify user for public mode
2014-11-21 18:02:26 +00:00
Selim Cinek
9c4a707912 Fixed several time related states for secondary users
The 24 hour setting was not respected correctly. Also
fixed a bug where the next alarm would not display itself
in the QS panel.

Bug: 16239208
Change-Id: I89734f783912dead5831db49db53fba04dbf54ee
2014-11-21 18:25:30 +01:00
Adrian Roos
c5db390f5b Revert "Only keep user switcher bitmaps if needed"
This reverts commit cba0faadbe1c8cf7c6b264b761d747f7381a2f93 
with change id I416beb82156787e61ee1f59b6726fd702f135f68.

It keeps the fix preventing us from reclipping already loaded
bitmaps.

Bug: 18350670
Change-Id: I0562d38d2a6eb0b715adcd4ca77512f2cbedd320
2014-11-21 13:59:42 +00:00
Adrian Roos
31b844ba0c Explicitly specify user for public mode
Bug: 18417850
Change-Id: I9d564a47fe66cb8035d73c8a2eedb912920410a2
2014-11-21 13:55:09 +01:00
John Spurlock
ed06df1314 am 1bd81e31: Merge "Doze: Make proximity check configurable." into lmp-mr1-dev
* commit '1bd81e31f31a6d8dc06af79985ca820effab970c':
  Doze: Make proximity check configurable.
2014-11-21 03:40:45 +00:00
John Spurlock
686e4d57d8 Doze: Make proximity check configurable.
Default to true, but make it available for overlay or setting
at runtime.

Bug: 18373928
Change-Id: I6abc1924ea0f03620f4683dc055f64ede5782809
2014-11-20 21:59:13 -05:00
Adrian Roos
62a7d53343 am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev
* commit '4e312d81c18b286170c904659e78cab4fdf27200':
  Add device locked API for TrustAgentService
2014-11-20 21:41:46 +00:00
Adrian Roos
866bae50b7 am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev
* commit 'af6e657ab873623ed0e94bc8bcf8ed03f6bbe167':
  Update KeyguardManager.isDeviceLocked API
2014-11-20 21:41:41 +00:00
Adrian Roos
4e312d81c1 Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev 2014-11-20 21:38:17 +00:00
Adrian Roos
af6e657ab8 Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev 2014-11-20 21:38:14 +00:00
Adrian Roos
481a6df99f Add device locked API for TrustAgentService
Bug: 18414067
Change-Id: I96c68af9ccc9940acf9fab3b5bd39a3485f01045
2014-11-20 21:48:38 +01:00
Adrian Roos
50bfeec868 Update KeyguardManager.isDeviceLocked API
Bug: 18414067
Change-Id: I0715714c2c9a122f578ec0c6f508faae12e6f752
2014-11-20 21:45:04 +01:00
Jorim Jaggi
d05064b850 Tint SIM images in PIN/PUK screen
Bug: 18147652
Change-Id: Ic077a80883782c228dce0d4537e4c7e5e3caf2b4
2014-11-20 21:36:52 +01:00
Jim Miller
52a6133f4b Add multi-sim support to keyguard
Use new telephony APIs.
Clean up SIM state machine code.
Use cached copy of SubscriptionInfo.
Make SIM PIN and SIM PUK work.

Tested on single and multi-SIM devices.

Fixes bug 18147652

Change-Id: Ic69a4d2898999a5438e6a70b5851705bc05443f1
2014-11-20 21:36:52 +01:00
Winson Chung
de04d5573a am 7c122b60: Merge "Use SystemClock time to keep track of last event times. (Bug 17995039)" into lmp-mr1-dev
* commit '7c122b60b93c9ef4fa428bc142ea61bf4252b70b':
  Use SystemClock time to keep track of last event times. (Bug 17995039)
2014-11-20 18:54:47 +00:00
Winson Chung
7c122b60b9 Merge "Use SystemClock time to keep track of last event times. (Bug 17995039)" into lmp-mr1-dev 2014-11-20 18:50:50 +00:00
Jorim Jaggi
6456513f6f am bf1960ce: Merge "Fade notifications when exiting dozing" into lmp-mr1-dev
* commit 'bf1960ce9c353267490d65cc1b8beacc7dd85347':
  Fade notifications when exiting dozing
2014-11-20 17:31:55 +00:00