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

169275 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sanket Padawe
8e2e6683e3 am ab4a940a: Merge "Make default carrier name string look better." into lmp-mr1-dev 
* commit 'ab4a940a8ae4a5fb63a84fa51527b7703e7bfc88':
  Make default carrier name string look better.
 2014-11-21 23:37:57 +00:00
John Reck
08372601ab am 418c8549: Merge "It\'s super critical to call nStart" into lmp-mr1-dev 
* commit '418c8549dca8bff8c38c67ed7f7d7fbbaccd4e71':
  It's super critical to call nStart
 2014-11-21 23:37:52 +00:00
Sanket Padawe
ab4a940a8a Merge "Make default carrier name string look better." into lmp-mr1-dev 2014-11-21 23:33:26 +00:00
John Reck
418c8549dc Merge "It's super critical to call nStart" into lmp-mr1-dev 2014-11-21 23:32:08 +00:00
Winson Chung
161b51ba06 am 207356ef: 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 '207356efae596b3860a384ced5f369462ce342d7':
  Reset the task stack instead of the view when Recents is hidden. (Bug. 18436876, Bug. 18394126, Bug. 18432310)
 2014-11-21 23:24:14 +00:00
Jeff Sharkey
4524e06de7 am 571dc539: am 17400627: Merge "Avoid NPE in forceStopPackageLocked()." into lmp-mr1-dev 
* commit '571dc539a120f234ecfc847edf57edc7762ab862':
  Avoid NPE in forceStopPackageLocked().
 2014-11-21 23:24:08 +00:00
Dianne Hackborn
d052a9416a Work on issue #18486438: Reduce size of bugreport output 
Reduce how much stuff ProcessStats spews, and do collapsing of
repeated intent filter targets when dumping IntentResolvers.

Also add to pm's checkout output to include shared user ids,
and fix output formatting in a few places.

Change-Id: Ic9fc6731f0439101ba9343535e66cdbbad47e291
 2014-11-21 15:23:13 -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
Jeff Sharkey
571dc539a1 am 17400627: Merge "Avoid NPE in forceStopPackageLocked()." into lmp-mr1-dev 
* commit '1740062728bf66f416b47b0c7f7d89c8d6b77504':
  Avoid NPE in forceStopPackageLocked().
 2014-11-21 23:19:30 +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
Jeff Sharkey
1740062728 Merge "Avoid NPE in forceStopPackageLocked()." into lmp-mr1-dev 2014-11-21 23:14:04 +00:00
Craig Mautner
c8d97850a8 am a673263d: am 0a398d7b: Merge "Treat screen-on while pausing as pause timeout." into lmp-mr1-dev 
* commit 'a673263d059997f846fa1765776758c6d06e5131':
  Treat screen-on while pausing as pause timeout.
 2014-11-21 23:07:14 +00:00
ztenghui
bb97b311ea am 21bc2e3e: am cb721bf6: Merge "Supporrt tapas build for vector tests" into lmp-mr1-dev 
* commit '21bc2e3e1e30e34d661e3c3cf961eb058ca3834e':
  Supporrt tapas build for vector tests
 2014-11-21 23:07:08 +00:00
Amith Yamasani
1f26bf6bfd am 108bdbc9: am efb2df69: Merge "Different messages when wiping user and not device" into lmp-mr1-dev 
* commit '108bdbc934d1e5fb77406d0267ab67f8736dfc57':
  Different messages when wiping user and not device
 2014-11-21 23:07:03 +00:00
Craig Mautner
a673263d05 am 0a398d7b: Merge "Treat screen-on while pausing as pause timeout." into lmp-mr1-dev 
* commit '0a398d7bb477c57508e5a7374e91cb331b689290':
  Treat screen-on while pausing as pause timeout.
 2014-11-21 23:01:01 +00:00
ztenghui
21bc2e3e1e am cb721bf6: Merge "Supporrt tapas build for vector tests" into lmp-mr1-dev 
* commit 'cb721bf674e3b36a7c16fcc8f61646404d348bd3':
  Supporrt tapas build for vector tests
 2014-11-21 23:00:56 +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
Craig Mautner
0a398d7bb4 Merge "Treat screen-on while pausing as pause timeout." into lmp-mr1-dev 2014-11-21 22:45:08 +00:00
ztenghui
cb721bf674 Merge "Supporrt tapas build for vector tests" into lmp-mr1-dev 2014-11-21 22:27:37 +00:00
John Reck
72d6e4facb It's super critical to call nStart 
Bug: 18204974

Even if we are canceling or ending an animation
nStart() *must* be called, otherwise the native-side listener
is not attached (lazy-attached for JNI cyclic reference reasons),
and then Animator::callOnFinishedListener() no-ops as there's
no listener set

Add a lifecycle verifier to ensure that nStart is always
called on animators that are attached and get finished

Change-Id: Ibc345b5be97b6d3f95a11c361ebe020d030fd3b6
 2014-11-21 14:27:21 -08: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
Chris Craik
90102e1009 am 1ae8a98e: am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev 
* commit '1ae8a98e8a6ba82396955c0b6ab0e02568a3494b':
  Revert "Add a way to override Xfermode DO NOT MERGE"
 2014-11-21 22:21:02 +00:00
Andreas Gampe
220c3f4f48 Merge "resolved conflicts for merge of 99377df1 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp 2014-11-21 22:20:31 +00:00
Andreas Gampe
2ab8298dc3 resolved conflicts for merge of 99377df1 to lmp-mr1-dev-plus-aosp 
Change-Id: I3a98f55832ac447b1ed0dd129c7a93d088025943
 2014-11-21 14:19:06 -08:00
Jeff Sharkey
27f36f4267 Avoid NPE in forceStopPackageLocked(). 
Bug: 18477180
Change-Id: I5d91ae11ed2fd6e1e67e54d83fa945bb4dcee221
 2014-11-21 14:17:17 -08:00
Chris Craik
1ae8a98e8a am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev 
* commit '29dc496a42d49a37dcd99c0465f3cec18a47e6ff':
  Revert "Add a way to override Xfermode DO NOT MERGE"
 2014-11-21 22:13:30 +00:00
Chris Craik
29dc496a42 Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev 2014-11-21 22:11:13 +00:00
Jeff Sharkey
79ef5ef7a5 am 54c11274: am c0491a2e: Merge "Lightweight checkin output for network stats." into lmp-mr1-dev 
* commit '54c11274b5e7ce9f774f7c846d7165563279b96a':
  Lightweight checkin output for network stats.
 2014-11-21 22:09:28 +00:00
Chris Craik
69e65019b0 Revert "Add a way to override Xfermode DO NOT MERGE" 
Feature no longer needed.

bug:18448377

This reverts commit 4678dcc5524258908eadc5fe1e5e1874768967eb.

Change-Id: Ib0a19946e966a54857165555827b5fa7b34b6bea
 2014-11-21 22:05:33 +00:00
Jeff Sharkey
54c11274b5 am c0491a2e: Merge "Lightweight checkin output for network stats." into lmp-mr1-dev 
* commit 'c0491a2e2d30eb4bc3e03fccee89d57e9bd575e4':
  Lightweight checkin output for network stats.
 2014-11-21 22:05:18 +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
Jeff Brown
4c9041cf83 am 1ac13e02: am 682ed6b6: Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev 
* commit '1ac13e0212a770c918d32e6c645682466113632c':
  Support keeping activities resumed while dozing.
 2014-11-21 21:59:47 +00:00
Jeff Sharkey
c0491a2e2d Merge "Lightweight checkin output for network stats." into lmp-mr1-dev 2014-11-21 21:59:17 +00: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
Jinsuk Kim
6d274dc2a5 am c86f09d7: am 2dafe666: Merge "CEC: Enable log for non-user builds" into lmp-mr1-dev 
* commit 'c86f09d714360ddcc0363157b56ae7446770ae01':
  CEC: Enable log for non-user builds
 2014-11-21 21:55:42 +00:00
Jeff Brown
1ac13e0212 am 682ed6b6: Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev 
* commit '682ed6b60807d5fa971dbd6c76deae788cb65df4':
  Support keeping activities resumed while dozing.
 2014-11-21 21:53:10 +00:00
Jinsuk Kim
c86f09d714 am 2dafe666: Merge "CEC: Enable log for non-user builds" into lmp-mr1-dev 
* commit '2dafe6664a7dd6d9aa227b0779a90891c2b1b2ef':
  CEC: Enable log for non-user builds
 2014-11-21 21:48:49 +00:00
Jeff Brown
682ed6b608 Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev 2014-11-21 21:48:47 +00:00
Jinsuk Kim
2dafe6664a Merge "CEC: Enable log for non-user builds" into lmp-mr1-dev 2014-11-21 21:43:23 +00:00
Andreas Gampe
99377df12e am d2738ead: Merge "Frameworks/base: Unused parameters in hwui" 
* commit 'd2738eadc1f8c92c64d47429ef3f168738431809':
  Frameworks/base: Unused parameters in hwui
 2014-11-21 21:38:42 +00:00
Jeff Brown
9ef9401938 resolved conflicts for merge of 694c1d2b to lmp-mr1-dev 
Change-Id: I9a9b724e0fd12aa161ff276540431b9d8e218e2b
 2014-11-21 21:35:08 +00:00
Andreas Gampe
d2738eadc1 Merge "Frameworks/base: Unused parameters in hwui" 2014-11-21 21:34:46 +00:00
Yigit Boyar
f532871ec4 am 1bbaeaa4: am ace33655: Merge "Improve GridLayout\'s weight calculations" into lmp-mr1-dev 
* commit '1bbaeaa4b5bab1a1eebb1e901292799c58fc5fe2':
  Improve GridLayout's weight calculations
 2014-11-21 21:00:04 +00:00
Jeff Davidson
11008a78b8 Don't enforce control permission when preparing consented VPN. 
If a VPN app requests to be prepared and has already obtained user
consent, there is no need to additionally enforce the control
permission. We only need to enforce the control permission when a VPN
is first being prepared, where such a preparation would bypass user
consent.

Also ensure that in this case, the VPN being prepared matches the
calling app. Otherwise an app could prepare another pre-consented VPN,
which is not particularly dangerous but is likely unexpected.

Finally, remove misleading comment in ConnectivityService#prepareVpn.
This method IS called from VpnService.prepare(), not only from
system-privileged apps.

Bug: 18442887
Change-Id: Ic3227c6c1c74312697f0576d3811b06692a4edff
 2014-11-21 12:56:29 -08:00
Yigit Boyar
1bbaeaa4b5 am ace33655: Merge "Improve GridLayout\'s weight calculations" into lmp-mr1-dev 
* commit 'ace33655bff514698b322253c211f0af5a3edd37':
  Improve GridLayout's weight calculations
 2014-11-21 20:55:19 +00:00
Chris Wren
a6d4fb60ed Push back notification means snooze the package. 
Bug: 18451923
Change-Id: I90160f9d14cde12a5bc03e46e64eedf770149a90
 2014-11-21 15:51:41 -05:00
Alan Viverette
d7c5acdf1c am e606a788: am 0218970a: Merge "Fix error overwriting when restoring error" 
* commit 'e606a7884dff4acc926cb82bf6492e83e9a1d3af':
  Fix error overwriting when restoring error
 2014-11-21 20:49:11 +00:00
Alan Viverette
47379f3050 am e442e904: am 47172f53: Merge "Use parseColor instead of getHTMLColor" 
* commit 'e442e904ae19f0b59ebfd4a7c735648b64bc955e':
  Use parseColor instead of getHTMLColor
 2014-11-21 20:49:04 +00:00
Yigit Boyar
ace33655bf Merge "Improve GridLayout's weight calculations" into lmp-mr1-dev 2014-11-21 20:48:45 +00:00
Alan Viverette
e606a7884d am 0218970a: Merge "Fix error overwriting when restoring error" 
* commit '0218970afaeefcabf7ed4b476cb93f28d61847b8':
  Fix error overwriting when restoring error
 2014-11-21 20:45:15 +00:00