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

12959 Commits

Author SHA1 Message Date
Dianne Hackborn
1b060e83c7 Merge "Hopefully fix issue #25153459: Sandboxed_process1 thrashing" into mnc-dr-dev am: 676534e008 am: 75c2993c91 am: ca8e4ce5fc 
am: 06496d0479

* commit '06496d04791f46a834a6d101068a1a999762d6a2':
  Hopefully fix issue #25153459: Sandboxed_process1 thrashing
 2015-10-22 00:59:09 +00:00
Dianne Hackborn
06496d0479 Merge "Hopefully fix issue #25153459: Sandboxed_process1 thrashing" into mnc-dr-dev am: 676534e008 am: 75c2993c91 
am: ca8e4ce5fc

* commit 'ca8e4ce5fc6ff65ef267ca1995876968afe24d8d':
  Hopefully fix issue #25153459: Sandboxed_process1 thrashing
 2015-10-22 00:53:08 +00:00
Dianne Hackborn
75c2993c91 Merge "Hopefully fix issue #25153459: Sandboxed_process1 thrashing" into mnc-dr-dev 
am: 676534e008

* commit '676534e00805e8102ea1458eba2b2cab1dbe7b3d':
  Hopefully fix issue #25153459: Sandboxed_process1 thrashing
 2015-10-22 00:40:35 +00:00
Dianne Hackborn
865907db09 Hopefully fix issue #25153459: Sandboxed_process1 thrashing 
There is a race where if you unbind to a service before its
process has come up, we would leave the service record active
and keep it running.  Fix this by checking the service state
after its process up and proceed to bring it down if it is no
longer needed.

Also added a similar check when restarting a service, just in
case there are other ways we can get into this situation.

And while I am at it, I tweaked the broadcast queue dump output
a bit to hopefully make it a lot easier to figure out how long
it is taking to process broadcasts.

Change-Id: I46b98f1fe394ab8039ea4cc81fb5d3afb6391a31
 2015-10-21 17:15:37 -07:00
Todd Kennedy
f81de0e4a5 Merge "Maintain shared user list on OTA" into mnc-dr-dev am: 0cd10ec8cf am: d12f298da4 am: c9f3b2f54b 
am: 68457b9cd4

* commit '68457b9cd49a695ed50c51eb9c0d0b63fcead737':
  Maintain shared user list on OTA
 2015-10-21 20:59:42 +00:00
Xiaohui Chen
6655630c96 Clean up UserHandle.isOwner() in frameworks 
Bug: 24869636
Change-Id: Ibebd7d0762f5375ee93ec101e7ab5578769bd9f6
 2015-10-21 20:57:04 +00:00
Todd Kennedy
68457b9cd4 Merge "Maintain shared user list on OTA" into mnc-dr-dev am: 0cd10ec8cf am: d12f298da4 
am: c9f3b2f54b

* commit 'c9f3b2f54b042df97a806ad114f21cca26a8341a':
  Maintain shared user list on OTA
 2015-10-21 20:52:31 +00:00
Jeff Sharkey
a15f791cd8 Narrow permission re-granting to specific volume. am: 052366ca4e am: 0b639c78f1 am: 7a6a7ae64d 
am: 949ea14429

* commit '949ea1442925cbbce72ccff1b0ffc7c7f876e97b':
  Narrow permission re-granting to specific volume.
 2015-10-21 20:52:29 +00:00
Jeff Sharkey
949ea14429 Narrow permission re-granting to specific volume. am: 052366ca4e am: 0b639c78f1 
am: 7a6a7ae64d

* commit '7a6a7ae64dea59c0ee3e617c333ec389fcfe911c':
  Narrow permission re-granting to specific volume.
 2015-10-21 20:45:22 +00:00
Filip Gruszczynski
516dd36e74 Merge "Make stack crop be aware of the big surface during resizing." 2015-10-21 20:42:39 +00:00
Todd Kennedy
d12f298da4 Merge "Maintain shared user list on OTA" into mnc-dr-dev 
am: 0cd10ec8cf

* commit '0cd10ec8cf7a896bbdfc0639bf5f9c663c46edbb':
  Maintain shared user list on OTA
 2015-10-21 20:38:28 +00:00
Todd Kennedy
0cd10ec8cf Merge "Maintain shared user list on OTA" into mnc-dr-dev 2015-10-21 20:33:31 +00:00
Jeff Sharkey
0b639c78f1 Narrow permission re-granting to specific volume. 
am: 052366ca4e

* commit '052366ca4e6138b583d08535bd1837deb7cd58d0':
  Narrow permission re-granting to specific volume.
 2015-10-21 20:32:42 +00:00
Todd Kennedy
68f6715bb2 Maintain shared user list on OTA 
When a package is removed during an OTA, we weren't removing it from the
shared user list. This means anyone asking for the packages for a shared
UID would continue to see the old package.

Bug: 24906701
Change-Id: Ifb6d64195e6b8af7454e19591611af66a40cbd10
 2015-10-21 13:22:01 -07:00
Filip Gruszczynski
1ee48c4f4b Make stack crop be aware of the big surface during resizing. 
When resizing we are using big surface, so we can't depend on the
window frame to determine how to crop it to its surface.

Change-Id: I6aaa32433c5db59dfe7ccb930a0485688e6e2503
 2015-10-21 13:19:10 -07:00
Jun Mukai
5ec7420ecd Use invisible icon for POINTER_ICON_STYLE_NULL. 
Change-Id: I10d35bdc4da4817d769eb164e6f15e4618670a05
 2015-10-21 13:03:01 -07:00
Anthony Hugh
3a36f0a3ab Merge "Watch dialer should have phone permission fixed" into cw-e-dev am: 52c6f9ecb3 am: 2cd707ef13 
am: 2b76beebac

* commit '2b76beebacacc438478b617020ed7e3a71c5f6fc':
  Watch dialer should have phone permission fixed
 2015-10-21 19:16:30 +00:00
Anthony Hugh
2b76beebac Merge "Watch dialer should have phone permission fixed" into cw-e-dev am: 52c6f9ecb3 
am: 2cd707ef13

* commit '2cd707ef137aedfc3d0bc048a21e122842cce8f6':
  Watch dialer should have phone permission fixed
 2015-10-21 19:08:48 +00:00
Anthony Hugh
52c6f9ecb3 Merge "Watch dialer should have phone permission fixed" into cw-e-dev 2015-10-21 18:52:51 +00:00
Anthony Hugh
d4539926a3 Watch dialer should have phone permission fixed 
Watch dialer should have phone permission as fixed.

BUG: 24976862
Change-Id: I8bbc63ab0d7dfb2e38eec641681ac9aacae330a0
 2015-10-21 11:39:35 -07:00
Jeff Sharkey
052366ca4e Narrow permission re-granting to specific volume. 
When mounting a storage volume after an SDK upgrade, the platform
grants install permissions requested by apps.  This patch fixes a
bug that was causing us to re-grant permissions for all installed
apps; we now narrow the granting to just the storage volume of
interest.

Also fixes a bug where scanning of internal ASECs would bump the
VersionInfo of the legacy apps-on-SD volume.

There is still a bug here around internal ASECs not being considered
for re-grants, but that needs to be fixed in a more invasive CL that
creates a separate VersionInfo.  In addition, internal ASECs (also
known as forward locked apps) have been deprecated for some time.

Bug: 24583803
Change-Id: I9115fd484ec083bc10a970f5f612860d5a53e520
 2015-10-21 10:42:14 -07:00
Paul Lawrence
d76d1d25cb Merge "Don\'t include password on default encryption command" into mnc-dr-dev am: 68521fd7ce am: 29c5fb2646 am: eab4352d9b 
am: 74a3281e9c

* commit '74a3281e9c7ec37ffcc826ee7ac8cdd4b57dfab8':
  Don't include password on default encryption command
 2015-10-21 17:03:46 +00:00
Paul Lawrence
74a3281e9c Merge "Don\'t include password on default encryption command" into mnc-dr-dev am: 68521fd7ce am: 29c5fb2646 
am: eab4352d9b

* commit 'eab4352d9bd945c7fa375c6f28972900f0b99671':
  Don't include password on default encryption command
 2015-10-21 16:49:24 +00:00
Wale Ogunwale
b3ad483f45 Merge "Ensure state transition of paused activity." am: c2b9c5388a am: 11695e8081 
am: 8d16a3ddea

* commit '8d16a3ddeac89c426c0965d792df63750a35460e':
  Ensure state transition of paused activity.
 2015-10-21 16:47:18 +00:00
Wale Ogunwale
8d16a3ddea Merge "Ensure state transition of paused activity." am: c2b9c5388a 
am: 11695e8081

* commit '11695e8081b269d489b5b4cc0b0c2075baeebc9b':
  Ensure state transition of paused activity.
 2015-10-21 16:33:25 +00:00
Wale Ogunwale
11695e8081 Merge "Ensure state transition of paused activity." 
am: c2b9c5388a

* commit 'c2b9c5388a4038ba260e2c36b7b8884cf4097c2e':
  Ensure state transition of paused activity.
 2015-10-21 16:08:51 +00:00
Paul Lawrence
29c5fb2646 Merge "Don\'t include password on default encryption command" into mnc-dr-dev 
am: 68521fd7ce

* commit '68521fd7ce5e87a4e752569b5691b75d441e8a48':
  Don't include password on default encryption command
 2015-10-21 14:53:23 +00:00
Paul Lawrence
68521fd7ce Merge "Don't include password on default encryption command" into mnc-dr-dev 2015-10-21 14:27:33 +00:00
Lorenzo Colitti
d913112189 Merge "Don\'t buzz when automatically connecting to captive portals" into mnc-dr-dev am: d214496319 am: 5c09f31e49 am: 18ec0b5187 
am: d597bf8f53

* commit 'd597bf8f536b319c02f82663ecb67e64525b5187':
  Don't buzz when automatically connecting to captive portals
 2015-10-21 02:28:06 +00:00
Lorenzo Colitti
d597bf8f53 Merge "Don\'t buzz when automatically connecting to captive portals" into mnc-dr-dev am: d214496319 am: 5c09f31e49 
am: 18ec0b5187

* commit '18ec0b518741dc5ac32c52ae9681efec3e73a23c':
  Don't buzz when automatically connecting to captive portals
 2015-10-21 02:19:15 +00:00
Jeff Sharkey
008672f62d Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev am: 55d2b6e8e6 am: 257d2ca7fd am: e01b99faa5 
am: 6dee8faff3

* commit '6dee8faff3b25c6dd6c8fa308ceb0fb8b31f6a05':
  Correctly derive ABI for apps on adopted media.
 2015-10-21 01:22:32 +00:00
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
Lorenzo Colitti
5c09f31e49 Merge "Don\'t buzz when automatically connecting to captive portals" into mnc-dr-dev 
am: d214496319

* commit 'd214496319785311f99f8415b7c8be3189420488':
  Don't buzz when automatically connecting to captive portals
 2015-10-21 01:15:27 +00:00
Lorenzo Colitti
d214496319 Merge "Don't buzz when automatically connecting to captive portals" into mnc-dr-dev 2015-10-21 01:10:10 +00:00
Lorenzo Colitti
46d50b708d Don't buzz when automatically connecting to captive portals 
Play a sound and vibrate (by setting DEFAULT_ALL) only if the
user manually selected the network. This applies to both captive
portals and networks with no Internet access.

Bug: 24126143
Change-Id: Idf075d5c85f9f4b07a3431a25d1a3f7089cf1ee2
 2015-10-21 09:59:31 +09: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
Rob Carr
55acb52e59 Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev am: 9ada400e98 am: 894dd2b078 am: a153a8072c 
am: e7413fc53f

* commit 'e7413fc53f47a31fbe998de48ee0e5edd79ed96c':
  Catch exceptions thrown by pending activity launches.
 2015-10-21 00:32:40 +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
Rob Carr
e7413fc53f Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev am: 9ada400e98 am: 894dd2b078 
am: a153a8072c

* commit 'a153a8072c0a28c36db2489a2ba13b1fc8e179db':
  Catch exceptions thrown by pending activity launches.
 2015-10-21 00:06:43 +00:00
Rob Carr
894dd2b078 Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev 
am: 9ada400e98

* commit '9ada400e98451d3ff39ea284be5c205c8c8a3f95':
  Catch exceptions thrown by pending activity launches.
 2015-10-20 23:51:23 +00:00
Filip Gruszczynski
c25f26a1d5 Merge "Fix recents from/to full screen app transition." 2015-10-20 23:33:16 +00:00
Rob Carr
9ada400e98 Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev 2015-10-20 23:30:12 +00:00
Kevin Cernekee
fc5c6090ec Merge "ignore initial request to disable iptable chain" into mnc-dr-dev am: 3554d62ca0 am: d166333eb5 
am: a3625076e5

* commit 'a3625076e58bbcf4909a9c17ce18948020e65ac3':
  ignore initial request to disable iptable chain
 2015-10-20 22:59:44 +00:00
Matthew Williams
f012481a44 Merge "DO NOT MERGE Race condition in JobServiceContext" into mnc-dr-dev am: cf43b5523f am: 07de80bd87 
am: 4e18ec7343

* commit '4e18ec7343ff91f0112dc0fedab6ea720857a6f5':
  DO NOT MERGE Race condition in JobServiceContext
 2015-10-20 22:57:06 +00:00
Michael Wright
244f776855 resolve merge conflicts of f013c3f111 to master. 
Change-Id: I2045187f8fa948a1733cb9a2cdc0a69ae97b5907
 2015-10-20 23:48:55 +01:00
Kevin Cernekee
d166333eb5 Merge "ignore initial request to disable iptable chain" into mnc-dr-dev 
am: 3554d62ca0

* commit '3554d62ca02bf6bc7777d1b22699876ec388fe6c':
  ignore initial request to disable iptable chain
 2015-10-20 22:18:22 +00:00
Matthew Williams
07de80bd87 Merge "DO NOT MERGE Race condition in JobServiceContext" into mnc-dr-dev 
am: cf43b5523f

* commit 'cf43b5523fd12fdc69ea25cb6dbf5e95724927ec':
  DO NOT MERGE Race condition in JobServiceContext
 2015-10-20 22:15:36 +00:00
Kevin Cernekee
3554d62ca0 Merge "ignore initial request to disable iptable chain" into mnc-dr-dev 2015-10-20 22:11:29 +00:00
Robert Carr
f1ddb5e090 Catch exceptions thrown by pending activity launches. 
When we perform pendign activity launches from the handler
thread (as opposed to the a client binder thread), we must
take care exceptions from such will not bring the system
server down.

Bug: 24983901
Change-Id: I0e75f6b51bf6172a8e1b9cccc5fffb9d50c63e30
 2015-10-20 21:51:26 +00:00