Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
210,976 Commits 3 Branches 0 Tags
4fe623763f6ef2eec50a92b09ce4f475ee6cbf56
Commit Graph

6404 Commits

Author SHA1 Message Date
Dianne Hackborn
908109c1f9 am 0385e3e9: am 8e63bbfd: am efa4dee1: am 977d421a: am f0e5501e: Merge "Fix issue #22989030: Separate battery whitelists" into mnc-dev 
* commit '0385e3e908fb9988bb2d2d0d15e32cb6a819b34e':
  Fix issue #22989030: Separate battery whitelists
 2015-08-08 02:49:41 +00:00
Matthew Williams
bb24672e97 am b244ed03: am b64f25ad: am 253f2c33: am 2327dd3f: am 9d929558: Merge "Correctly skip files that are excluded from restore" into mnc-dev 
* commit 'b244ed03531e77f178bf9a3150b8f46c4711c78b':
  Correctly skip files that are excluded from restore
 2015-08-08 02:49:30 +00:00
Dianne Hackborn
0385e3e908 am 8e63bbfd: am efa4dee1: am 977d421a: am f0e5501e: Merge "Fix issue #22989030: Separate battery whitelists" into mnc-dev 
* commit '8e63bbfd00ee27fcdbb04cfc0cf96ccdb2c50cc5':
  Fix issue #22989030: Separate battery whitelists
 2015-08-07 22:30:17 +00:00
Dianne Hackborn
efa4dee126 am 977d421a: am f0e5501e: Merge "Fix issue #22989030: Separate battery whitelists" into mnc-dev 
* commit '977d421af9466ed6cd83630f6ba91c873f501e5b':
  Fix issue #22989030: Separate battery whitelists
 2015-08-07 22:13:02 +00:00
Dianne Hackborn
f0e5501e09 Merge "Fix issue #22989030: Separate battery whitelists" into mnc-dev 2015-08-07 21:58:38 +00:00
Matthew Williams
b244ed0353 am b64f25ad: am 253f2c33: am 2327dd3f: am 9d929558: Merge "Correctly skip files that are excluded from restore" into mnc-dev 
* commit 'b64f25ad97a92be4dcf8844c79c218ae9c1e0af4':
  Correctly skip files that are excluded from restore
 2015-08-07 21:53:21 +00:00
Matthew Williams
253f2c334e am 2327dd3f: am 9d929558: Merge "Correctly skip files that are excluded from restore" into mnc-dev 
* commit '2327dd3f808c871f9e89772f06152052f6c74957':
  Correctly skip files that are excluded from restore
 2015-08-07 21:37:33 +00:00
Matthew Williams
9d92955894 Merge "Correctly skip files that are excluded from restore" into mnc-dev 2015-08-07 21:25:31 +00:00
Dianne Hackborn
4a503b1ece Fix issue #22989030: Separate battery whitelists 
We now have a new whitelist you can put apps in, which
opts them out of the old battery saver mode and new app idle,
but doesn't keep them from going in to doze.  This is for a few
special cases that we had previously whitelisted for battery saver,
and inherited to the new modes...  ultimately we should figure out
how to get these apps out of the whitelist completely, but this
will help for now.

Apps in this new whitelist are not shown in the UI, because they
are still significantly restricted by not being able to operate
normally in doze.  This also means they are still visible in the
list of all apps for the user to be able to put them on/off the
complete whitelist if that is what they really want.

In the course of doing this, I needed to clean up code in the
network policy manager to better separate management of the
two firewall rules that now have different whitelists applied
to them.  This also hopefully just generally simplifies and cleans
up that code.  Hopefully!

Change-Id: I92e15f2f85899571dd8b049b5e3eb1354f55f353
 2015-08-07 14:23:32 -07:00
Stefan Kuhne
3acd69327e Merge "Adding missing WindowStackCallback to Window" 2015-08-07 20:15:48 +00:00
Dongwon Kang
de0d5d746f MediaRouter: make MediaRouteButton inherit Widget.Material.ActionButton 
Also, fix onMeasure() to ensure that (min) width/height includes paddings.

Bug: 22947288
Change-Id: Iba49d89e014d0df747cbdde8383de4158700ac70
 2015-08-07 18:29:23 +00:00
Stefan Kuhne
9bad7410e5 Adding missing WindowStackCallback to Window 
Bug: 22984908
Change-Id: I0efe210c2e1d2efba3e3ca20e6db393a904f28b9
 2015-08-07 10:59:05 -07:00
Svetoslav Ganov
598b03d100 am 9bf912c1: am 5ed03384: am 1f514608: am 5a624aad: am 38d30dc5: Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev 
* commit '9bf912c1cf6941402dc0f8ef449f34787796875e':
  Immediately kill a shared user process on a permission revocation.
 2015-08-07 16:02:04 +00:00
Svetoslav Ganov
9bf912c1cf am 5ed03384: am 1f514608: am 5a624aad: am 38d30dc5: Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev 
* commit '5ed0338499b4f6cb8fd9eeedae7c89133c02d247':
  Immediately kill a shared user process on a permission revocation.
 2015-08-07 15:55:55 +00:00
Svetoslav Ganov
1f51460887 am 5a624aad: am 38d30dc5: Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev 
* commit '5a624aad5faa0a71ce6495671caac1ccd90544ba':
  Immediately kill a shared user process on a permission revocation.
 2015-08-07 15:40:35 +00:00
Svetoslav Ganov
38d30dc547 Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev 2015-08-07 15:27:49 +00:00
Svetoslav
aa41add33b Immediately kill a shared user process on a permission revocation. 
1. When a permission is revoked we kill the app immediately but do
   not do an immediate kill for shared uid processes. This fixes it.

2. Remove system APIs that are used only by the package installer.

bug:22984670

Change-Id: I3d4ae52ea8679f894aa7c5972941263903479183
 2015-08-06 18:47:41 -07:00
Wale Ogunwale
6e02fa01a0 Merge changes I4fc1b47e,Icc6d6b25,I8c6bb864 
* changes:
  Support for an activity to change and/or query it's associated stack
  Support creating/launching a task with non-fullscreen bounds
  Support finishing a task with any finishing activity in the task.
 2015-08-06 17:29:28 +00:00
Matthew Williams
b9ebed56e4 Correctly skip files that are excluded from restore 
BUG: 22957980
If a file was present in the backup but excluded on restore,
it can result in the restored data being corrupted.
Ensure that FullBackup.restoreFile is called with a
null destination, which will result in the file not
being written to disk, but still properly pulled
from the socket.

Change-Id: Iac882a961b76e687654535aec352678486a08c39
 2015-08-06 10:28:08 -07:00
Dianne Hackborn
a1a9644529 am 74423ccf: am aacc7978: am 41dfffb3: am db6a6a21: am 6b0f1e78: Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev 
* commit '74423ccf95c9d09a52a6a6fbe8ccedb1be88eda9':
  Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult
 2015-08-06 17:24:31 +00:00
Dianne Hackborn
74423ccf95 am aacc7978: am 41dfffb3: am db6a6a21: am 6b0f1e78: Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev 
* commit 'aacc797809e5bf2c02735cb3a7d92c5ccefb5116':
  Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult
 2015-08-06 17:19:53 +00:00
Dianne Hackborn
41dfffb357 am db6a6a21: am 6b0f1e78: Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev 
* commit 'db6a6a215e9f55b9413e18ca9c67aa3ef31bbefb':
  Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult
 2015-08-06 17:00:47 +00:00
Wale Ogunwale
868a5e16c3 Support for an activity to change and/or query it's associated stack 
Change-Id: I4fc1b47e5d6196a56a6e40f10fae97219554722c
 2015-08-06 09:59:32 -07:00
Wale Ogunwale
ba7881c89e Support finishing a task with any finishing activity in the task. 
Change-Id: I8c6bb864de6dc135e0fedb16ee424d7816ee3cfa
 2015-08-06 09:59:32 -07:00
Dianne Hackborn
6b0f1e78b8 Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev 2015-08-06 16:48:34 +00:00
Alan Treadway
f67dcd9526 am a544ea9b: am 351c3bd1: am 54f1ffcd: am 2d1cf627: am 190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev 
* commit 'a544ea9b97342e2cc872f9a527de5960814349ef':
  Update documentation of DevicePolicyManager intents.
 2015-08-06 16:20:09 +00:00
Alan Treadway
a544ea9b97 am 351c3bd1: am 54f1ffcd: am 2d1cf627: am 190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev 
* commit '351c3bd16b4c23d267f3dc2c00a555a82fd7e77e':
  Update documentation of DevicePolicyManager intents.
 2015-08-06 16:14:42 +00:00
Alan Treadway
54f1ffcdd6 am 2d1cf627: am 190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev 
* commit '2d1cf6278587224125da298aba42044aff1d5d8c':
  Update documentation of DevicePolicyManager intents.
 2015-08-06 15:59:43 +00:00
Alan Treadway
190a88d2ce Merge "Update documentation of DevicePolicyManager intents." into mnc-dev 2015-08-06 15:47:34 +00:00
Alan Treadway
4582f8113d Update documentation of DevicePolicyManager intents. 
Add additional information about the intentions of result codes in
device-owner and profile-owner launch intents, in alignment with
changes made in http://ag/732321.

Bug: 21063241
Change-Id: I0e0a931739cee5f46e8fc7622fe1de49e26dcb0a
 2015-08-06 16:44:52 +01:00
Dianne Hackborn
6bdd3a155f Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult 
Add new Activity callback to tell it when its saved state has
been invalidated.

The problem is that delivering the permission result does not go
through a path where the compatibility code can see it first to
mark its fragment manager as no longer having saved state.  So this
new callback gives it a place to do that.

Change-Id: I5a4a185d9c746bae1afb5c588aba82c8daccf079
 2015-08-05 15:01:28 -07:00
Rubin Xu
82543934db am 9b5bd26e: am c0ad5751: am 6b6b9cd9: am 01496367: am ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev 
* commit '9b5bd26ee1855e5527f448e5e26181e12320b956':
  Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE
 2015-08-05 17:49:31 +00:00
Rubin Xu
9b5bd26ee1 am c0ad5751: am 6b6b9cd9: am 01496367: am ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev 
* commit 'c0ad5751f895a1f76b8302b7fd068bd62a6058f3':
  Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE
 2015-08-05 17:44:22 +00:00
Rubin Xu
6b6b9cd911 am 01496367: am ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev 
* commit '0149636785a00eced7aeb97a6b5606c46582d05c':
  Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE
 2015-08-05 17:09:00 +00:00
Rubin Xu
41f2ccb9e4 Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE 
Starting from M, this extra is also supported in NFC bump provisioning.

Bug: 22914251
Change-Id: I835d12918c5de4ff782245def6565eeb0f052934
 2015-08-05 17:21:25 +01:00
Paul Soulos
2b1899a197 am af393e4b: am eca3760f: am 3adc6671: Merge "Fix doc typo for default wearable notification size." into cw-e-dev 
* commit 'af393e4b2d1fa0def0d104bfeaafa1ae1600d4d2':
  Fix doc typo for default wearable notification size.
 2015-08-04 20:36:52 +00:00
Paul Soulos
af393e4b2d am eca3760f: am 3adc6671: Merge "Fix doc typo for default wearable notification size." into cw-e-dev 
* commit 'eca3760f3a7ceae967a6afb5ff6b8a1e7cf541fa':
  Fix doc typo for default wearable notification size.
 2015-08-04 20:30:33 +00:00
Paul Soulos
3adc6671e9 Merge "Fix doc typo for default wearable notification size." into cw-e-dev 2015-08-04 20:13:41 +00:00
Paul Soulos
aa4f4bf6ce Fix doc typo for default wearable notification size. 
Change-Id: Ic3428278eee0b541de3e1b355692401170d1ab3b
 2015-08-04 11:59:45 -07:00
Wale Ogunwale
04413d5c58 am fad3cfed: am a93e7e5e: am c170d7de: am ae351ec1: am b2690f38: Merge "Fail silently if a process trys to launch an acitvity for background user" into mnc-dev 
* commit 'fad3cfed7b831bfa6c0d5e261cb208a3475ef426':
  Fail silently if a process trys to launch an acitvity for background user
 2015-08-04 15:15:03 +00:00
Wale Ogunwale
fad3cfed7b am a93e7e5e: am c170d7de: am ae351ec1: am b2690f38: Merge "Fail silently if a process trys to launch an acitvity for background user" into mnc-dev 
* commit 'a93e7e5e7817d354997e7c4c16a95776498b9f91':
  Fail silently if a process trys to launch an acitvity for background user
 2015-08-04 15:08:09 +00:00
Wale Ogunwale
b2690f3857 Merge "Fail silently if a process trys to launch an acitvity for background user" into mnc-dev 2015-08-04 14:38:04 +00:00
Ian Pedowitz
a371084e29 resolved conflicts for merge of d4b8064e to master 
Change-Id: I3d41b5bd0ecdd97f8e563b061fc8648d2206bc31
 2015-08-03 23:38:43 -07:00
Dianne Hackborn
3fa5609d83 am aa860fd8: am 35c68de9: am 5dd9ef04: am b0bc8368: am 3011f645: Merge "Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up" into mnc-dev 
* commit 'aa860fd83ab3d3096c4bdf86297b7d8f36f5eec8':
  Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up
 2015-08-04 01:40:48 +00:00
Dianne Hackborn
d4b8064e42 am 14bafef5: am 24922798: am b20a8ed9: am d9b0f843: Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev 
* commit '14bafef5b050f14c0fed3bfed8b137862139e627':
  Fix issue #22860466: viapi security bug - rubber stamping in nested VIs
 2015-08-04 01:37:57 +00:00
Dianne Hackborn
aa860fd83a am 35c68de9: am 5dd9ef04: am b0bc8368: am 3011f645: Merge "Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up" into mnc-dev 
* commit '35c68de93dfec0a237642cca56ade0ba3a6aff92':
  Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up
 2015-08-04 01:30:52 +00:00
Dianne Hackborn
d9b0f8435b Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev 2015-08-04 01:07:36 +00:00
Dianne Hackborn
fb81d09d35 Fix issue #22860466: viapi security bug - rubber stamping in nested VIs 
Add new Activity.isVoiceInteractionRoot() API that an activity can use
to determine whether it is the root activity of a voice interaction
session started by the user's designated voice interaction service.

This is a special new API that apps must explicitly check, because as
with visual activities the model behind an activity should usually be
that it accomplishes its task by interacting with the user (implicitly
getting their approval) rather than trusting that whoever invoked it
is telling it to do what the user once.  In the voice world, however,
there are some cases where quick interactions want to allow for immediate
execution without further user involvement, so this API allows for that
without opening up security holes from other applications.

Change-Id: Ie02d2458f16cb0b12af825641bcf8beaf086931b
 2015-08-03 17:33:38 -07:00
Wale Ogunwale
f5ea12c2aa Fail silently if a process trys to launch an acitvity for background user 
Doing this so we don't break current apps. In the future we should
properly position the activity in the stack (i.e. behind all current
user activity/task) and not change the positioning of stacks.

Bug: 21801163
Bug: 13507605
Bug: 22929608
Change-Id: I979b6288e66f5b2ec2a6f22cb8d416e5c68109bd
 2015-08-03 15:56:49 -07:00
Dianne Hackborn
28ec27cbfa Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up 
Slice 'em up!

Change-Id: Ibba3af7ec5b7f92e6d5e55a57aa838a7f7f936e1
 2015-08-03 15:28:28 -07:00