Jeff Sharkey
07c6628d68
Merge "Handle "uninstalled" apps when pruning app-ops." into mnc-dr-dev am: a975732a83 am: 637d05eb5c
...
am: d359137d41
* commit 'd359137d419023f207351251cdbfa23180236963':
Handle "uninstalled" apps when pruning app-ops.
2015-10-30 21:59:36 +00:00
Jeff Sharkey
637d05eb5c
Merge "Handle "uninstalled" apps when pruning app-ops." into mnc-dr-dev
...
am: a975732a83
* commit 'a975732a8302893a40cdc444f893bf09b7669173':
Handle "uninstalled" apps when pruning app-ops.
2015-10-30 21:37:17 +00:00
Anthony Hugh
c2b3e48bb1
Merge "Add intent extra for determining if apps are system apps" into cw-e-dev am: 3a9bf5c8ce
...
am: a8e20b3919
* commit 'a8e20b391909cbc115e8996bd247e84a2819bfc3':
Add intent extra for determining if apps are system apps
2015-10-30 20:19:36 +00:00
Anthony Hugh
3a9bf5c8ce
Merge "Add intent extra for determining if apps are system apps" into cw-e-dev
2015-10-30 20:04:10 +00:00
Jeff Sharkey
e2ed23e6b2
Handle "uninstalled" apps when pruning app-ops.
...
During system boot, we prune app-ops belonging to apps that have
been uninstalled. However, apps installed on adopted storage devices
haven't been scanned at this point, so they appear to be uninstalled.
To avoid pruning app-ops for these apps, we need a getPackageUid()
variant that also considers "uninstalled" apps for which we still
have PackageSetting values.
Bug: 25206071
Change-Id: I1820f674d45c5ddc1c5f10ed7d859e7025005e28
2015-10-29 19:04:15 -07:00
Bryce Lee
698b33ea7f
Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev am: 4636770f0d
...
am: 3b6f9f78cf
* commit '3b6f9f78cf0ea09176250059653d05cf6a5282c4':
Add ability to set whether audio route is allowed in BluetoothHeadsetClient
2015-10-29 07:23:06 +00:00
Bryce Lee
dc13382622
Add ability to set whether audio route is allowed in BluetoothHeadsetClient
...
Bug: 25332357
Change-Id: I942ac0dea3e4f8580c44e027a570d0b59822a257
2015-10-28 22:21:54 -07:00
Bryce Lee
8faa19c826
Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev am: 0a80294c81
...
am: 2adf45bee0
* commit '2adf45bee0b423fa6ca758b806a16b968c0a3c65':
Revert "Declare new interface for headset client bluetooth profile to query."
2015-10-29 05:19:19 +00:00
Bryce Lee
70d4210e2e
Revert "Declare new interface for headset client bluetooth profile to query."
...
This reverts commit 694251eaaa .
Change-Id: I588206d8aedb96254c27494dddb32ddc3b6ea0ea
2015-10-29 04:58:38 +00:00
Bryce Lee
2b47b6eed2
Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev am: a841973dee
...
am: 8b4f21b108
* commit '8b4f21b108828c08833767c1f3f908e1cd7f8477':
Declare new interface for headset client bluetooth profile to query.
2015-10-29 04:53:01 +00:00
Bryce Lee
694251eaaa
Declare new interface for headset client bluetooth profile to query.
...
This is needed in order to allow implementations of the HFP HF side to
define when audio can be routed to the device. This allows for calls dialed
from an AG to be kept on the AG if desired.
Bug: 25332357
Change-Id: I35a554cfc53f88c7dd3059bf52df5c69df9c7415
2015-10-28 21:06:27 -07:00
Anthony Hugh
3575a40009
Add intent extra for determining if apps are system apps
...
This is being added to help identify system apps so that
the UI can filter on that type.
BUG: 24955055
Change-Id: Ie4be3717ce997f60eeb48a389c0f54ce5803141a
2015-10-26 17:47:05 -07:00
Adrian Roos
989b719e64
Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev am: 93a6b4c129 am: a53bbb652b
...
am: 5e5f718d23
* commit '5e5f718d236234f3a4bc5826dc805b6b8c53283c':
Revert "Revert "Track ashmem memory usage in Parcel""
2015-10-23 18:25:02 +00:00
Adrian Roos
a53bbb652b
Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev
...
am: 93a6b4c129
* commit '93a6b4c12904bd1804a540d006c183851b0aea33':
Revert "Revert "Track ashmem memory usage in Parcel""
2015-10-23 17:29:13 +00:00
Adrian Roos
0450565d9a
Revert "Revert "Track ashmem memory usage in Parcel""
...
This reverts commit e2adb2cf0f .
Bug: 25004154
Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158
2015-10-22 17:49:38 -07:00
Ian Pedowitz
d3511518f9
Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev am: 09fd4ecf90 am: b402735fc0
...
am: 07129d53b5
* commit '07129d53b5380ec556fa14c7506a26b6776e629a':
Revert "Track ashmem memory usage in Parcel"
2015-10-22 22:46:06 +00:00
Ian Pedowitz
b402735fc0
Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev
...
am: 09fd4ecf90
* commit '09fd4ecf90c7ae2536a6848e8c88c4878e0e0c24':
Revert "Track ashmem memory usage in Parcel"
2015-10-22 22:32:37 +00:00
Ian Pedowitz
09fd4ecf90
Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev
2015-10-22 22:26:32 +00:00
Ian Pedowitz
e2adb2cf0f
Revert "Track ashmem memory usage in Parcel"
...
This reverts commit ab3f972403 .
Bug: 25169267
Bug: 25191602
Bug: 25004154
Change-Id: Ic51e62515273e4687359dfd9ff770a4d06c0c667
2015-10-22 22:09:04 +00:00
Yoshiki Iguchi
fb8343549a
Fix crash on calling removeSelection with showing selection handlers am: 9582e15196 am: 6649ee972b
...
am: 6a5bb1534c
* commit '6a5bb1534c736c21260c5c488ff58e4d81972f92':
Fix crash on calling removeSelection with showing selection handlers
2015-10-22 07:49:00 +00:00
Yoshiki Iguchi
6649ee972b
Fix crash on calling removeSelection with showing selection handlers
...
am: 9582e15196
* commit '9582e151964be60457d4abd712857fb1e8a4586d':
Fix crash on calling removeSelection with showing selection handlers
2015-10-22 07:39:17 +00:00
Yoshiki Iguchi
9582e15196
Fix crash on calling removeSelection with showing selection handlers
...
A crash occured on updating after calling removeSelection with showing
selection handlers. This was because some selection-handler code didn't
consider the case the selection index was -1 (-1 means there is no selection).
This patch fixes this crash.
Bug: 23299977
Change-Id: I736d315e073f773aec597522203015205a8da42b
2015-10-22 07:28:47 +00:00
Lorenzo Colitti
8ecad265b6
Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev am: 809dcade99 am: bdc458048a
...
am: bb8f652372
* commit 'bb8f652372f261edd2083103d4300a9173993706':
Reinstate CHANGE_NETWORK_STATE as a normal permission.
2015-10-22 06:28:24 +00:00
Lorenzo Colitti
bdc458048a
Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev
...
am: 809dcade99
* commit '809dcade9906001f6aa51a68aa783e20bb1d7c0d':
Reinstate CHANGE_NETWORK_STATE as a normal permission.
2015-10-22 06:18:43 +00:00
Lorenzo Colitti
809dcade99
Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev
2015-10-22 06:15:05 +00:00
Adrian Roos
b531762c89
Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev am: 33e1d376eb am: 655c12edb0
...
am: fda65d780e
* commit 'fda65d780eea9f696b087deb8d532b87e44877b6':
Track ashmem memory usage in Parcel
2015-10-22 01:02:27 +00:00
Adrian Roos
655c12edb0
Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev
...
am: 33e1d376eb
* commit '33e1d376ebd643cba5b507d0005b87d49e246bb5':
Track ashmem memory usage in Parcel
2015-10-22 00:49:52 +00:00
Adrian Roos
ab3f972403
Track ashmem memory usage in Parcel
...
Bug: 25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
(cherry picked from commit 4701a496a5 )
2015-10-22 00:31:47 +00:00
Lorenzo Colitti
d542705066
Reinstate CHANGE_NETWORK_STATE as a normal permission.
...
This is a partial revert of http://ag/738523 , but not a full
revert because M apps that have gone through the WRITE_SETTINGS
route to obtain permission to change network state should
continue to have permission to do so.
Specifically:
1. Change the protection level of CHANGE_NETWORK_STATE back from
"signature|preinstalled|appop|pre23" to "normal". This allows
apps that declare CHANGE_NETWORK_STATE in their manifest to
acquire it, even if they target the M SDK or above.
2. Change the ConnectivityManager permission checks so that they
first check CHANGE_NETWORK_STATE, and then ask Settings
if the app has the WRITE_SETTINGS runtime permission.
3. Slightly simplify the code in the Settings provider code that
deals specifically with the ability to change network state.
4. Make the ConnectivityService permissions checks use the
ConnectivityManager code to avoid code duplication.
5. Update the ConnectivityManager public Javadoc to list both
CHANGE_NETWORK_STATE and WRITE_SETTINGS.
Bug: 21588539
Bug: 23597341
Change-Id: Ic06a26517c95f9ad94183f6d126fd0de45de346e
2015-10-22 08:33:45 +09:00
Tao Bao
db33bfc2a9
Merge "Clean up the uncrypted OTA package on bootup." am: 5d562d4d2f
...
am: ac140e7f76
* commit 'ac140e7f7690979378897546e7934381f62922ab':
Clean up the uncrypted OTA package on bootup.
2015-10-21 18:05:18 +00:00
Tao Bao
ac140e7f76
Merge "Clean up the uncrypted OTA package on bootup."
...
am: 5d562d4d2f
* commit '5d562d4d2fe5697468e5b93b183ed8ea42e115a2':
Clean up the uncrypted OTA package on bootup.
2015-10-21 17:51:53 +00:00
Andrei Stingaceanu
fe622345b0
Merge "Fix toolbar flickering in ExtractedMode when longpressing." into mnc-dr-dev am: ee4ab0a55b am: 24fc647e70
...
am: 509a74972a
* commit '509a74972af13c845a67ad9edddd8e413cc7884a':
Fix toolbar flickering in ExtractedMode when longpressing.
2015-10-21 16:55:37 +00:00
Andrei Stingaceanu
24fc647e70
Merge "Fix toolbar flickering in ExtractedMode when longpressing." into mnc-dr-dev
...
am: ee4ab0a55b
* commit 'ee4ab0a55b355b21168de0eb5615f2e321c2982f':
Fix toolbar flickering in ExtractedMode when longpressing.
2015-10-21 16:03:52 +00:00
Andrei Stingaceanu
ee4ab0a55b
Merge "Fix toolbar flickering in ExtractedMode when longpressing." into mnc-dr-dev
2015-10-21 15:56:26 +00:00
Andrei Stingaceanu
2aaeefec92
Fix toolbar flickering in ExtractedMode when longpressing.
...
onPreDraw starts an action mode in extract mode only which
does not consider the type of motion event and since extracted
mode never gets the focus event it never hides so it does not
need to show again.
Stop starting an action mode onPreDraw in extracted mode and
let the onTouchEvent handle starting the mode.
Also re-enabled dragging and dropping for ExtractedMode (most
of the issues were caused by starting the action mode
onPreDraw).
Bug: 25102276
Change-Id: I90d8e9f42f395b6b529e4d023ba6939e0dfb147f
2015-10-21 15:42:00 +01: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
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