Commit Graph

6241 Commits

Author SHA1 Message Date
George Mount
da74111e47 am de036f5d: am 60ca7690: am b72c1579: am 91202e59: am 503ad9ee: Merge "Fix input pause without resume." into mnc-dev
* commit 'de036f5dead5a9f6f7da6b3853345d9e777c1b15':
  Fix input pause without resume.
2015-07-15 15:22:20 +00:00
George Mount
de036f5dea am 60ca7690: am b72c1579: am 91202e59: am 503ad9ee: Merge "Fix input pause without resume." into mnc-dev
* commit '60ca7690bc556abe71869b05304ee469fa9546c5':
  Fix input pause without resume.
2015-07-15 15:07:41 +00:00
George Mount
503ad9ee0d Merge "Fix input pause without resume." into mnc-dev 2015-07-15 14:12:28 +00:00
Dianne Hackborn
e0d96ce96c am 808dd5cc: am 4753b5bc: am 4f73990a: am aa3694f2: am f1f8b9cc: Merge "Fix issue #21626564: MMS should be receivied while Dozing" into mnc-dev
* commit '808dd5cc8af3e26d12c1b5fe80663eb306cc0c20':
  Fix issue #21626564: MMS should be receivied while Dozing
2015-07-15 02:37:04 +00:00
Dianne Hackborn
808dd5cc8a am 4753b5bc: am 4f73990a: am aa3694f2: am f1f8b9cc: Merge "Fix issue #21626564: MMS should be receivied while Dozing" into mnc-dev
* commit '4753b5bcf4877e125a8e38d5bcd2ac46c1744429':
  Fix issue #21626564: MMS should be receivied while Dozing
2015-07-15 02:21:54 +00:00
Fyodor Kupolov
b5143ecfee am 1fa2a088: am 1281575c: am 41fac5e8: am 189f3136: am 98724126: Merge "Added sendBroadcastMultiplePermissions method" into mnc-dev
* commit '1fa2a0888284ae00c905dce7a3003b995815467a':
  Added sendBroadcastMultiplePermissions method
2015-07-15 01:58:48 +00:00
Fyodor Kupolov
1fa2a08882 am 1281575c: am 41fac5e8: am 189f3136: am 98724126: Merge "Added sendBroadcastMultiplePermissions method" into mnc-dev
* commit '1281575c257d52f256f4a08559611e6ec0b6190e':
  Added sendBroadcastMultiplePermissions method
2015-07-15 01:42:58 +00:00
Dianne Hackborn
fd854ee58c Fix issue #21626564: MMS should be receivied while Dozing
We now place whoever is receiving the MMS on the temporary
whitelist while doing so, so they can get network access to
download it.

There was also an issue that needed to be fixed where we
were no longer updating the list of allowed uids while
dozing based on their proc states...  we now do that.

Also did a bit of optimization of the temp white list update
path do the network policy manager, instead of going through
a broadcast we now directly call in to the network policy
manager.  This also allows us to have a synchronous version
of updating the list, so we can know the app has network access
before we tell it to do anything.

Finally added battery stats events for things going on and off
the whitelist so we can diagnose the behavior there.

Change-Id: Ic7fe010af680034d9f8cb014bb135b2addef7455
2015-07-14 18:33:08 -07:00
Fyodor Kupolov
d4fd8c766d Added sendBroadcastMultiplePermissions method
Added Context.sendBroadcastMultiplePermissions(Intent intent, String[]
receiverPermissions) method, which allows an array of required permissions
to be enforced.

Bug: 21852542
Change-Id: I27c9130e8f004b428452501ebc8a36aabde1f343
2015-07-14 17:25:42 -07:00
Fyodor Kupolov
9ac5983c7b am 7aeb1a5c: am cf4617cf: am 1aeceef4: am fc4acfd9: am 4a817924: Merge "Revert "Allow array of required permissions in sendBroadcast"" into mnc-dev
* commit '7aeb1a5c19a1226f2b0ca7b498bdad941d206808':
  Revert "Allow array of required permissions in sendBroadcast"
2015-07-15 00:11:44 +00:00
Fyodor Kupolov
7aeb1a5c19 am cf4617cf: am 1aeceef4: am fc4acfd9: am 4a817924: Merge "Revert "Allow array of required permissions in sendBroadcast"" into mnc-dev
* commit 'cf4617cfd0c9da1fa5a12da5ed576dd0c823f8e5':
  Revert "Allow array of required permissions in sendBroadcast"
2015-07-14 23:55:48 +00:00
Fyodor Kupolov
34ff2b04c9 am 64e8aa18: am 7f006b52: am 70174794: am ef77c116: am d69a82c1: Merge "Allow array of required permissions in sendBroadcast" into mnc-dev
* commit '64e8aa18f8c089989113ecd8775d41bffe74b41d':
  Allow array of required permissions in sendBroadcast
2015-07-14 23:10:56 +00:00
Fyodor Kupolov
64e8aa18f8 am 7f006b52: am 70174794: am ef77c116: am d69a82c1: Merge "Allow array of required permissions in sendBroadcast" into mnc-dev
* commit '7f006b52215634f37aa881157df6473b8e3dd803':
  Allow array of required permissions in sendBroadcast
2015-07-14 22:56:11 +00:00
Fyodor Kupolov
4a817924ec Merge "Revert "Allow array of required permissions in sendBroadcast"" into mnc-dev 2015-07-14 22:43:47 +00:00
Fyodor Kupolov
e37520b49d Revert "Allow array of required permissions in sendBroadcast"
This reverts commit b4e7283c9a.

Change-Id: Ie8390964bda5bdfa869cee8f46584043d8e7c664
2015-07-14 22:29:21 +00:00
Jeff Sharkey
dc3e83eae3 am 026d6f97: am de404257: am 556136c8: am c7a60749: am d3719ab0: Merge "Better handling of storage paths." into mnc-dev
* commit '026d6f97d120f7f557a50effd82e6b3b6f032870':
  Better handling of storage paths.
2015-07-14 22:12:28 +00:00
Jeff Sharkey
026d6f97d1 am de404257: am 556136c8: am c7a60749: am d3719ab0: Merge "Better handling of storage paths." into mnc-dev
* commit 'de404257a99d3a94b4d92923248af77817e447ed':
  Better handling of storage paths.
2015-07-14 22:01:16 +00:00
Fyodor Kupolov
d69a82c107 Merge "Allow array of required permissions in sendBroadcast" into mnc-dev 2015-07-14 21:57:34 +00:00
James Cook
06f8ebb73f Merge "Fix SysUI crash when launching Chrome from app shelf" 2015-07-14 21:30:27 +00:00
Mathieu Chartier
f8cc20031e am 82f91da7: am ad4a285a: am ebac4d1b: Merge "Change conditionallyCheckInstanceCounts to use countInstancesOfClasses"
* commit '82f91da700445c4606faea45ac8f0dc9f2857471':
  Change conditionallyCheckInstanceCounts to use countInstancesOfClasses
2015-07-14 20:47:32 +00:00
Mathieu Chartier
82f91da700 am ad4a285a: am ebac4d1b: Merge "Change conditionallyCheckInstanceCounts to use countInstancesOfClasses"
* commit 'ad4a285af619ea29f79dbe4da19061c49f24a8c9':
  Change conditionallyCheckInstanceCounts to use countInstancesOfClasses
2015-07-14 20:27:42 +00:00
Jeff Sharkey
983294596e Better handling of storage paths.
Give more details about why we failed to create storage paths, and
search for underlying volumes using canonical paths.

Bug: 22135060
Change-Id: I75d3584403ece310438b05f5b9fe72d94c9096c6
2015-07-14 13:08:22 -07:00
Fyodor Kupolov
b4e7283c9a Allow array of required permissions in sendBroadcast
Added Context.sendBroadcast(Intent intent, String[] receiverPermissions)
method, which allows an array of required permissions to be enforced.

Bug: 21852542
Change-Id: I3b8ff258fa9f3249c344bb8093b820b24eef00c0
2015-07-14 12:50:22 -07:00
James Cook
4d0ef042d3 Fix SysUI crash when launching Chrome from app shelf
* Store entire ActivityManager.RecentTaskInfo for each icon,
  not just the ComponentName.
* Use RecentTaskInfo.persistentId to check if an icon already
  exists.
* Extend RecentTaskInfo to include the actual activity that
  started the task.
* On dragging an icon to the pinned area, use the RecentTaskInfo
  to pin the primary launch intent of the app.

Bug: 22117860
Change-Id: Ia4412ea8e259e53cd7b5babcb79a292b92629db0
2015-07-14 10:49:34 -07:00
George Mount
80141d1c8b Fix input pause without resume.
Bug 22455206

Previously, when an exit activity transition was created, the input
would be paused. This worked fine as long as the transition was
run. However, sometimes that transition wasn't run and this would
cause the input to fail to be started again.

This fix moves the input pause to when the transition is started.

Change-Id: I738d5471f7932f00b50897f87a8f8a71ecbc57e2
2015-07-14 10:03:06 -07:00
Mathieu Chartier
d288a26672 Change conditionallyCheckInstanceCounts to use countInstancesOfClasses
countInstancesOfClasses allows passing multiple classes unlike
countInstanceOfClass. This provides a speedup since we dont traverse
the heap multiple times.

Changed ActivityThread.dumpMemInfo to do a GC since countInstancesOfClass
no longer does GC before counting.

https://code.google.com/p/android/issues/detail?id=177552

Change-Id: Ia85684f40cf59a52aa71a8479c711a994651209b
2015-07-10 15:33:59 -07:00
Dianne Hackborn
7b3aa5019b am 8e697eb1: am 04efda69: am 6b335380: am 47306086: am a681d7d9: Merge "Improve alarm manager docs." into mnc-dev
* commit '8e697eb1312bb975d7b7eee5cee71ca3c56e1d26':
  Improve alarm manager docs.
2015-07-10 02:38:38 +00:00
Svet Ganov
5a9a85d3d2 am 0bdfb97a: am 88c3918d: am 3ceb043f: am b7cf986e: am 171fe6ac: Merge "Add an API for apps to query if a permisison is denied by policy." into mnc-dev
* commit '0bdfb97a0acb8b40c78b1f40151b334d5401a2d1':
  Add an API for apps to query if a permisison is denied by policy.
2015-07-10 02:38:11 +00:00
Dianne Hackborn
8e697eb131 am 04efda69: am 6b335380: am 47306086: am a681d7d9: Merge "Improve alarm manager docs." into mnc-dev
* commit '04efda693713243a47afb193ae389d5d36ff5dfa':
  Improve alarm manager docs.
2015-07-10 02:23:46 +00:00
Svet Ganov
0bdfb97a0a am 88c3918d: am 3ceb043f: am b7cf986e: am 171fe6ac: Merge "Add an API for apps to query if a permisison is denied by policy." into mnc-dev
* commit '88c3918d00ba7eed22ce20e80dde44b34f552d76':
  Add an API for apps to query if a permisison is denied by policy.
2015-07-10 02:23:25 +00:00
Dianne Hackborn
a681d7d92b Merge "Improve alarm manager docs." into mnc-dev 2015-07-10 01:19:49 +00:00
Dianne Hackborn
14c5ab4cb9 Improve alarm manager docs.
Change-Id: I7547b48327a709783d908509efc7afd1a3f1a06a
2015-07-09 18:17:54 -07:00
Svet Ganov
171fe6ac0a Merge "Add an API for apps to query if a permisison is denied by policy." into mnc-dev 2015-07-10 00:32:12 +00:00
Dianne Hackborn
b6fbe91a02 am 782e31df: am 2dc2cdc0: am 1dfeb0b2: am d0e005de: am 0e7d497c: Merge "Fix issue #22328792: Fix scalability issues in AssistStructure" into mnc-dev
* commit '782e31dfcc448eaaab814fd76f42c3390a952037':
  Fix issue #22328792: Fix scalability issues in AssistStructure
2015-07-09 23:29:51 +00:00
Dianne Hackborn
782e31dfcc am 2dc2cdc0: am 1dfeb0b2: am d0e005de: am 0e7d497c: Merge "Fix issue #22328792: Fix scalability issues in AssistStructure" into mnc-dev
* commit '2dc2cdc026e8494c09f0cc44205cf22f513b78eb':
  Fix issue #22328792: Fix scalability issues in AssistStructure
2015-07-09 23:12:33 +00:00
Dianne Hackborn
782d498268 Fix issue #22328792: Fix scalability issues in AssistStructure
We can now stream the AssistStructure across processes, avoiding
IPC size limitations for large structures.  There is also a new
API that gets called on the VoiceInteractionSession if there is
a failure retrieving the assist data.

Also fix issue #22351981: Runtime restart due to ANR in system server,
getting rid of a deadlock.

And also tweak object lifecycles to try to avoid keeping around
in an app the previous AssistStructure after we request a new one.

Change-Id: Ifb136a0d31a14e56a8db6b90768d9fc65557a17f
2015-07-09 14:06:47 -07:00
Jorim Jaggi
61a3a523c7 am 46e30763: am 5175b3c9: am 9acf475c: am 35094376: am 3cc5c24b: Merge "Fix assist for hardware long-press" into mnc-dev
* commit '46e30763df273ea1ba6f102c8a8557b36ba5cc8a':
  Fix assist for hardware long-press
2015-07-09 20:32:28 +00:00
Jorim Jaggi
46e30763df am 5175b3c9: am 9acf475c: am 35094376: am 3cc5c24b: Merge "Fix assist for hardware long-press" into mnc-dev
* commit '5175b3c9923f5eaf5eafa01798966f8711ce9547':
  Fix assist for hardware long-press
2015-07-09 20:16:30 +00:00
Jorim Jaggi
3cc5c24b83 Merge "Fix assist for hardware long-press" into mnc-dev 2015-07-09 19:19:05 +00:00
Svet Ganov
ad3b297557 Add an API for apps to query if a permisison is denied by policy.
bug:22177216

Change-Id: I32227f55097fae997f33743fd1eee06cb18f47f1
2015-07-08 18:12:58 -07:00
Jorim Jaggi
165ce066b7 Fix assist for hardware long-press
Activating the assistant will now route through SysUI, so
we have the logic whether to start an activity or to start a voice
interaction session in one single place.

Bug: 22201770
Change-Id: I0f4699533aea2a1e595ee25a844434c82f548c01
2015-07-08 22:26:24 +00:00
Benjamin Franz
54b09b3494 am 5a9102e3: am 12ceccaf: am 4b7d3b47: am 051762f7: am c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev
* commit '5a9102e307f395dec106cd5e0109abf9b0e07d5b':
  Clarify javadoc of setPermissionPolicy
2015-07-08 15:17:12 +00:00
Benjamin Franz
5a9102e307 am 12ceccaf: am 4b7d3b47: am 051762f7: am c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev
* commit '12ceccaf7aa4198bb578bcba844729c0ac146d6d':
  Clarify javadoc of setPermissionPolicy
2015-07-08 14:47:52 +00:00
Benjamin Franz
c088e30fd4 Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev 2015-07-08 13:59:34 +00:00
Benjamin Franz
45dd6667e8 Clarify javadoc of setPermissionPolicy
Bug: 22192363
Change-Id: I552eae1e84ce866d9873faacb5c261321351915a
2015-07-08 14:37:28 +01:00
Zoltan Szatmary-Ban
9a4c5f2782 am 55a3a233: am 5bc85aa8: am d426cf73: am 30871415: am 89592760: Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-dev
* commit '55a3a23307ba1591b95941f7c487c931da505ce0':
  Expose time-interval detail query on INetworkStatsSession
2015-07-08 13:10:13 +00:00
Zoltan Szatmary-Ban
55a3a23307 am 5bc85aa8: am d426cf73: am 30871415: am 89592760: Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-dev
* commit '5bc85aa8dbfdf03a5e764e74c415189c1bfa591c':
  Expose time-interval detail query on INetworkStatsSession
2015-07-08 12:55:18 +00:00
Zoltan Szatmary-Ban
8959276036 Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-dev 2015-07-08 11:33:00 +00:00
Dianne Hackborn
1699ba48ce am 88936b7f: am a719be69: am 15e35270: am 5e449276: am f2474d33: Merge "Implement better handling of text in assist." into mnc-dev
* commit '88936b7f82a6ec4023078e62304425147da4b56e':
  Implement better handling of text in assist.
2015-07-08 02:05:44 +00:00
Dianne Hackborn
88936b7f82 am a719be69: am 15e35270: am 5e449276: am f2474d33: Merge "Implement better handling of text in assist." into mnc-dev
* commit 'a719be69b1e0c8c6723457a51673f5dab8f9f819':
  Implement better handling of text in assist.
2015-07-08 01:39:53 +00:00