Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
212,432 Commits 3 Branches 0 Tags
6dee8faff3b25c6dd6c8fa308ceb0fb8b31f6a05
Commit Graph

56198 Commits

Author SHA1 Message Date
Jeff Sharkey
6dee8faff3 Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev am: 55d2b6e8e6 am: 257d2ca7fd 
am: e01b99faa5

* commit 'e01b99faa54a083ae7b10db902a03f4aa6c9bd63':
  Correctly derive ABI for apps on adopted media.
 2015-10-21 01:15:29 +00:00
Jeff Sharkey
257d2ca7fd Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev 
am: 55d2b6e8e6

* commit '55d2b6e8e6f364e2fd52c45b5fa3eb6a56082456':
  Correctly derive ABI for apps on adopted media.
 2015-10-21 00:55:05 +00:00
Jeff Sharkey
55d2b6e8e6 Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev 2015-10-21 00:48:47 +00:00
Jeff Sharkey
bbcb331205 Correctly derive ABI for apps on adopted media. 
There was a bug causing PackageManager to think apps on adopted media
were actually in an ASEC, causing it to skip ABI derivation.  This
change fixes the issue by copying the volume UUID into place early
in the scanning process.

Also fixes two places where we had incorrectly been including apps
on adopted media; switched them to check only for ASECs.

Bug: 24583803
Change-Id: If66d1bce02824a4d8e22f741b04a2abda0378cfb
 2015-10-20 17:32:05 -07:00
Alan Viverette
e21329ad86 Merge "DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure" into mnc-dr-dev am: 4823493647 am: ac02be311d 
am: 41707942a8

* commit '41707942a8aea8c9122482f28f2fd599e55d0791':
  DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure
 2015-10-20 22:27:25 +00:00
Alan Viverette
ac02be311d Merge "DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure" into mnc-dr-dev 
am: 4823493647

* commit '482349364715dfcd87dc83e0913fc60dc6df0497':
  DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure
 2015-10-20 21:56:40 +00:00
Alan Viverette
4823493647 Merge "DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure" into mnc-dr-dev 2015-10-20 21:44:35 +00:00
Alan Viverette
b5817779a9 DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure 
Bug: 22824701
Bug: 25107144
Change-Id: Ia0afd3edc20b8127605aef2653fa9b5472f41be2
(cherry picked from commit 130ce740d1)
 2015-10-20 17:29:39 -04:00
Matthew Williams
c31529097d DO NOT MERGE Sync extras bundle comparison can throw NPE am: 7d7a2254bc am: cb937cbc6a 
am: d7d56a4feb

* commit 'd7d56a4feb5502e17dea4ebb4c9b22347be2b7d3':
  DO NOT MERGE Sync extras bundle comparison can throw NPE
 2015-10-20 21:06:31 +00:00
Matthew Williams
cb937cbc6a DO NOT MERGE Sync extras bundle comparison can throw NPE 
am: 7d7a2254bc

* commit '7d7a2254bc41d2dfc34fbb8693cb0dad2ccd528a':
  DO NOT MERGE Sync extras bundle comparison can throw NPE
 2015-10-20 20:42:07 +00:00
Rob Carr
2d021f9f48 Merge "Correct ActivityInfo constructors." into mnc-dr-dev am: cfea184d6c am: e2a49862c1 
am: 8caf80d571

* commit '8caf80d571c37bc6fefd68227432fd49d76aaa93':
  Correct ActivityInfo constructors.
 2015-10-20 19:26:38 +00:00
Matthew Williams
7d7a2254bc DO NOT MERGE Sync extras bundle comparison can throw NPE 
BUG: 23591205
Change-Id: Ic6404c0befe70c34b078e0eae6a627826173d82c
(cherry picked from commit 9ad2c84033)
 2015-10-20 18:55:30 +00:00
Abodunrinwa Toki
4d14e65cdf Merge "Re-set PROCESS_TEXT selection if nothing was returned." into mnc-dr-dev am: 3bd3655fd0 am: 9e97c20ed9 
am: 0eef4ab567

* commit '0eef4ab5678f9f3eaecd74b5e00990cef5b8d967':
  Re-set PROCESS_TEXT selection if nothing was returned.
 2015-10-20 18:51:03 +00:00
Rob Carr
e2a49862c1 Merge "Correct ActivityInfo constructors." into mnc-dr-dev 
am: cfea184d6c

* commit 'cfea184d6c0268b92ed55276d2b686962c8ee531':
  Correct ActivityInfo constructors.
 2015-10-20 18:33:58 +00:00
Jeff Sharkey
647afb199e Merge "Ignore network policies with missing IMSI." into mnc-dr-dev am: 38463bb950 am: 5d7604323f 
am: 3b30aae6e7

* commit '3b30aae6e702cbdad4ada69b76e4bc50fa2e161c':
  Ignore network policies with missing IMSI.
 2015-10-20 18:33:48 +00:00
Alan Viverette
27c5cbe5a8 Merge "Update drawable matrix when bounds change in invalidateDrawable()" into mnc-dr-dev am: 840f38905c am: e3d745291e 
am: c3e46adc77

* commit 'c3e46adc7797b4e894ef1e8ffd972acddb8fbbfa':
  Update drawable matrix when bounds change in invalidateDrawable()
 2015-10-20 18:27:41 +00:00
George Mount
aa4ffbc7cb Merge "Set the bounds on the drawable for ChangeBounds reparenting." into mnc-dr-dev am: 1313020acc am: ee15f087db 
am: bc71059223

* commit 'bc7105922318391815660c2082ccfc621d27103c':
  Set the bounds on the drawable for ChangeBounds reparenting.
 2015-10-20 18:25:13 +00:00
Rob Carr
cfea184d6c Merge "Correct ActivityInfo constructors." into mnc-dr-dev 2015-10-20 18:20:27 +00:00
Abodunrinwa Toki
9e97c20ed9 Merge "Re-set PROCESS_TEXT selection if nothing was returned." into mnc-dr-dev 
am: 3bd3655fd0

* commit '3bd3655fd05a548f6e60cfccd4185a4b9ae2a7d6':
  Re-set PROCESS_TEXT selection if nothing was returned.
 2015-10-20 18:06:44 +00:00
Robert Carr
8ab115a9aa Correct ActivityInfo constructors. 
ActivityInfo was missing initialization for the
documentLaunchMode flag in the copy-constructor
and the Parcel constructor. The copy-constructor
is used in multi-user/profile mode to create a
seperate instance of the ActivityInfo per uid
and this was manifesting in the linked bug.

Bug: 21590916
Change-Id: I6f71d94ec32ec6326d23c9b62e9d8d319e2fa25e
(cherry picked from commit 3e2e011785)
 2015-10-20 17:48:11 +00:00
Abodunrinwa Toki
3bd3655fd0 Merge "Re-set PROCESS_TEXT selection if nothing was returned." into mnc-dr-dev 2015-10-20 17:47:28 +00:00
Michael Wright
f013c3f111 resolve merge conflicts of 57a5cba606 to cw-e-dev. am: bab2b42445 
am: b959ce872c

* commit 'b959ce872c37e5f49c8f77ad188fcb9970dcce7a':
  Add SystemUI component to watch for keyboard attachment.
 2015-10-20 17:44:46 +00:00
Jeff Sharkey
5d7604323f Merge "Ignore network policies with missing IMSI." into mnc-dr-dev 
am: 38463bb950

* commit '38463bb950390a7b50fb07a990d9ed6990d07539':
  Ignore network policies with missing IMSI.
 2015-10-20 17:32:57 +00:00
Alan Viverette
e3d745291e Merge "Update drawable matrix when bounds change in invalidateDrawable()" into mnc-dr-dev 
am: 840f38905c

* commit '840f38905c073044077cb2bef68d20971f5d3d39':
  Update drawable matrix when bounds change in invalidateDrawable()
 2015-10-20 17:24:45 +00:00
George Mount
ee15f087db Merge "Set the bounds on the drawable for ChangeBounds reparenting." into mnc-dr-dev 
am: 1313020acc

* commit '1313020acc93e601c98779d8859f44391c504ba2':
  Set the bounds on the drawable for ChangeBounds reparenting.
 2015-10-20 17:23:45 +00:00
Jeff Sharkey
38463bb950 Merge "Ignore network policies with missing IMSI." into mnc-dr-dev 2015-10-20 17:21:46 +00:00
Alan Viverette
840f38905c Merge "Update drawable matrix when bounds change in invalidateDrawable()" into mnc-dr-dev 2015-10-20 16:54:12 +00:00
George Mount
1313020acc Merge "Set the bounds on the drawable for ChangeBounds reparenting." into mnc-dr-dev 2015-10-20 16:41:33 +00:00
Abodunrinwa Toki
3b8a5ea036 Re-set PROCESS_TEXT selection if nothing was returned. 
Bug: 25043887
Change-Id: If069a5e23f1adf6a2c3aac8fe7e3f19cff2e28ad
 2015-10-20 17:11:26 +01:00
Michael Wright
bab2b42445 resolve merge conflicts of 57a5cba606 to cw-e-dev. 
Change-Id: Ib43f0cf0b285c9799239658859af735279f87fff
 2015-10-20 17:06:27 +01:00
Michael Wright
57a5cba606 Merge "Add SystemUI component to watch for keyboard attachment." into mnc-dr-dev 2015-10-20 15:31:01 +00:00
Todd Kennedy
186fcb8b64 Merge "Retain fragment loaders" into mnc-dr-dev am: ad968cf4e5 am: 6320767fb1 
am: 02940eb47f

* commit '02940eb47fc1bdb3b069e42190bf8a70a9b916bf':
  Retain fragment loaders
 2015-10-20 14:58:40 +00:00
Todd Kennedy
6320767fb1 Merge "Retain fragment loaders" into mnc-dr-dev 
am: ad968cf4e5

* commit 'ad968cf4e55afdd897ea84a44b7450442aea1e1d':
  Retain fragment loaders
 2015-10-20 14:41:23 +00:00
Todd Kennedy
ad968cf4e5 Merge "Retain fragment loaders" into mnc-dr-dev 2015-10-20 14:36:00 +00:00
Alan Viverette
01320de844 Update drawable matrix when bounds change in invalidateDrawable() 
Bug: 24797872
Change-Id: Ib2bcce6f7d6fab33633a915882821b00d94e4e44
 2015-10-20 13:51:21 +00:00
Adam Powell
f94ce52404 Merge "DO NOT MERGE Fix jank when intent resolver/chooser windows animate in" into mnc-dr-dev am: 4ecfbcfdea am: eeed032eae 
am: 2a61cc8032

* commit '2a61cc803203e605b1f4a017deec0aedb21605f3':
  DO NOT MERGE Fix jank when intent resolver/chooser windows animate in
 2015-10-20 01:49:35 +00:00
Adam Powell
eeed032eae Merge "DO NOT MERGE Fix jank when intent resolver/chooser windows animate in" into mnc-dr-dev 
am: 4ecfbcfdea

* commit '4ecfbcfdeaed67c3a08002069a530fa58582a48b':
  DO NOT MERGE Fix jank when intent resolver/chooser windows animate in
 2015-10-20 00:54:34 +00:00
Adam Powell
4ecfbcfdea Merge "DO NOT MERGE Fix jank when intent resolver/chooser windows animate in" into mnc-dr-dev 2015-10-20 00:33:37 +00:00
Adam Powell
918b90108b DO NOT MERGE Fix jank when intent resolver/chooser windows animate in 
An old optimization in ViewRoot prevents updating a window surface
while a window animation is playing. SystemUI and other small system
components that blend these animations disable this for a smoother
experience. Disable it in ResolverActivity as well.

Bug 24989381

Change-Id: Iac7d1c7b1101ed8d2bc4c3557277a773ce871beb
 2015-10-19 16:56:20 -07:00
Todd Kennedy
eede174f7b Merge "Set host when restoring a fragment" into mnc-dr-dev am: 986d4b482d am: d419d86952 
am: e9c7512147

* commit 'e9c751214715f3d136ae07fe9f553c488d01f352':
  Set host when restoring a fragment
 2015-10-19 23:52:37 +00:00
Jeff Sharkey
56859f323c Ignore network policies with missing IMSI. 
In rare cases, we might have created a network policy before an IMSI
was available.  Because this policy is persisted, and we incorrectly
think that it always applies, we end up annoying the user when data
usage goes over the 2GB default warning threshold.

This patch fixes the network matching logic to ignore these empty
network policies when present.

Bug: 24972775
Change-Id: Id26499b6716121dddf0f2c05b848b0bed5995e72
 2015-10-19 16:52:08 -07:00
Svetoslav Ganov
7fdc5d95ad Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev am: e199016a82 am: aebff7f1ad 
am: 2a95159d2c

* commit '2a95159d2cce4321205ca7f40027a97acc2fb77e':
  Don't allow concurrent permission requests.
 2015-10-19 23:50:28 +00:00
George Mount
ef396b57c6 Set the bounds on the drawable for ChangeBounds reparenting. 
Bug 24993183

The bounds for the drawable weren't being set, so the
drawable was never drawn to the correct size.

Change-Id: I992951f28ee6fac2ce8752d2dc0e23f51d3cf584
(cherry picked from commit f2a3703696)
 2015-10-19 23:42:38 +00:00
Todd Kennedy
2ee19c7f46 Retain fragment loaders 
Remove the partial fix [it did not work for child fragment managers]
and replace with a more general fix that works with all fragments.

Bug: 23838271
Change-Id: I88b465f6a06a6ad627b9651b9e2eea41fae08972
 2015-10-19 16:40:03 -07:00
Todd Kennedy
d419d86952 Merge "Set host when restoring a fragment" into mnc-dr-dev 
am: 986d4b482d

* commit '986d4b482da952cd07e329b3bd11c935edd7ec01':
  Set host when restoring a fragment
 2015-10-19 23:22:57 +00:00
Svetoslav Ganov
aebff7f1ad Merge "Don\'t allow concurrent permission requests." into mnc-dr-dev 
am: e199016a82

* commit 'e199016a82329b645a86db345c2d39322c8ad03a':
  Don't allow concurrent permission requests.
 2015-10-19 23:13:46 +00:00
Todd Kennedy
986d4b482d Merge "Set host when restoring a fragment" into mnc-dr-dev 2015-10-19 22:52:27 +00:00
Svetoslav Ganov
e199016a82 Merge "Don't allow concurrent permission requests." into mnc-dr-dev 2015-10-19 22:41:35 +00:00
Aravind Akella
fd81002e71 am 73b6750c: am 005d36d1: Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev am: a817c90a7a 
* commit '73b6750cb6c3c9d5d7602878fd7020fa114a3cd3':
  Fix a possible race condition in SensorManager initialization.
 2015-10-19 21:41:36 +00:00
Aravind Akella
005d36d1b0 Merge "Fix a possible race condition in SensorManager initialization." into mnc-dr-dev 
am: a817c90a7a

* commit 'a817c90a7ab296473345b0e106acc9be4e5b678c':
  Fix a possible race condition in SensorManager initialization.
 2015-10-19 21:32:25 +00:00