Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
180,764 Commits 3 Branches 0 Tags
f8c669d3d2b67e4e6b34a4d5faec6ea8a07faf10
Commit Graph

5359 Commits

Author SHA1 Message Date
Jim Miller
8abb6d5e9f am 0ac8dfa3: Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev automerge: ffd1a49 
automerge: 54dbd1f

* commit '54dbd1fd437862346f7cdacc484acd3e10501bfb':
  Clarify getTrustAgentConfiguration() documentation.
 2015-01-22 02:50:25 +00:00
Jim Miller
54dbd1fd43 am 0ac8dfa3: Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev automerge: ffd1a49 
* commit '0ac8dfa37bf089ade3760a8d703c6a79d98f5ca2':
  Clarify getTrustAgentConfiguration() documentation.
 2015-01-22 02:45:16 +00:00
Dianne Hackborn
4da9bbbbd9 Merge "Bring back voice interaction APIs." 2015-01-21 23:45:55 +00:00
Dianne Hackborn
4e106cedfe Bring back voice interaction APIs. 
Change-Id: I6039d7c0b188ac342441c56f7d19994b9a80ba17
 2015-01-21 15:07:20 -08:00
Craig Mautner
7b15552692 Merge "Refactor removeApp and removeTask for last removals." 2015-01-21 22:19:25 +00:00
Craig Mautner
e3119b7d35 Refactor removeApp and removeTask for last removals. 
Move app token removal to the AppWindowToken class so cleanup can
be done locally. Move task removal to the Task class so cleanup can
be done locally. Call task removal when the last app is removed.
Merge actions done prior to method calls into methods.

Fixes bug 18088522 item #12.

Change-Id: I5ce85d2bb309ceb82bd7404e27a56a7c31cd7359
 2015-01-21 13:57:24 -08:00
Jim Miller
b5db57a27d Clarify getTrustAgentConfiguration() documentation. 
Fixes bug 18983802

Change-Id: I2f6e208cdd4fac95d1d0228bec3de8199baafa57
 2015-01-21 21:01:02 +00:00
Dianne Hackborn
4b94649ce3 Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev automerge: 2132695 automerge: 5346a21 
automerge: f6b4b1a

* commit 'f6b4b1a43253d5ea94763cf9750224c7b7b618c0':
  Work on issue #18201239: ANRs in com.google.process.gapps:
 2015-01-21 19:00:55 +00:00
Dianne Hackborn
f6b4b1a432 Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev automerge: 2132695 
automerge: 5346a21

* commit '5346a21bad95796611760d40c1540d1659038216':
  Work on issue #18201239: ANRs in com.google.process.gapps:
 2015-01-21 18:55:12 +00:00
Dianne Hackborn
455625e298 Work on issue #18201239: ANRs in com.google.process.gapps: 
Reason: Executing service com.google.android.syncadapters.contacts
/.SyncHighResPhotoIntentService

Make the code more robust when destroying services, so that if
the nesting count gets out of sync we don't just hang.

Change-Id: If117d5ef242e7c148fd9576bd89a1a092583d6ad
 2015-01-21 09:55:13 -08:00
Johnson Hsieh
24c33d32cc Merge "Expose CommandRequest completion status." 2015-01-21 01:39:19 +00:00
Johnson Hsieh
dd32946def Expose CommandRequest completion status. 
Expose CommandRequest completion status in client api onCommandResult().

Change-Id: Ib2066b7ca6d7b1ae968da7e7686e34107dc7dfa8
 2015-01-20 17:11:50 -08:00
Todd Kennedy
e50c298cc2 Merge "Don't read float from parcel" 2015-01-20 19:26:45 +00:00
Todd Kennedy
e635f66842 Don't read float from parcel 
We were reading a float from a parcel, but, never writing the float. Also
opportunistically fix a couple warnings where we were using raw classes
instead of their templatized version.

Bug: 19001243
Change-Id: I6e2a72795cf12bfaf880f2f46c1d91b207aa327c
 2015-01-20 11:12:52 -08:00
Todd Kennedy
4900bf9d82 Expose new binder call createStackOnDisplay() 
Creates a new, empty ActivityStack on a display. Use the binder call to
launch an activity on said stack.

Bug: 19001243
Change-Id: I0f04e8f2703bcc706f58e75333869fb35f6b1ee9
 2015-01-20 10:51:49 -08:00
Craig Mautner
62ccbb306b am 62e815bf: am 02c7c97a: am ac70b2d1: Merge "More debugging for bug 18201239." into lmp-mr1-dev 
* commit '62e815bf7b154fe984e1a2aa8d615a2f04f71785':
  More debugging for bug 18201239.
 2015-01-16 21:12:53 +00:00
Craig Mautner
62e815bf7b am 02c7c97a: am ac70b2d1: Merge "More debugging for bug 18201239." into lmp-mr1-dev 
* commit '02c7c97a62ba9b79e56d1f7e206615e6eaca0689':
  More debugging for bug 18201239.
 2015-01-16 21:07:13 +00:00
Craig Mautner
ac70b2d172 Merge "More debugging for bug 18201239." into lmp-mr1-dev 2015-01-16 20:56:58 +00:00
Craig Mautner
66c4a824b9 More debugging for bug 18201239. 
Fixes bug 19045133.

Change-Id: I2ef2b8600278ed91df59db4acf4740dac970ee3a
 2015-01-16 12:52:54 -08:00
Ricardo Cervera
23a6d889aa am 1e59b338: am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '1e59b338e6d1a270947908e53cefd088e2e38fb3':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 20:06:53 +00:00
Ricardo Cervera
1e59b338e6 am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '083146428420dd3daa887d6e9c019e747a604cb5':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 18:47:08 +00:00
Ricardo Cervera
90312d808f am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '2287879039556ad3c8fce58974e2396b4a2dab45':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 18:36:45 +00:00
Ricardo Cervera
2287879039 am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '93f94c2ca5bf23533fc5a9bd70a4795584d20618':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 18:29:25 +00:00
Ricardo Cervera
93f94c2ca5 resolved conflicts for merge of e8f6bd48 to lmp-dev 
Change-Id: Idc370182914d5060a721d34c26cd72598f2c6dff
 2015-01-16 09:54:30 -08:00
Ricardo Cervera
e8f6bd4846 am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 
* commit '98f07d901492335f51258655fbfa032fa3f2d58e':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 17:21:32 +00:00
Jeff Sharkey
0ec9c29fb7 am c2ae6fb9: Merge commit \'605eb79c9519307147fc1795d0eb155638a7f542\' into manualmerge 
* commit 'c2ae6fb9ada52e9c990542a6d1cae80085318f31':
  Offer to detect non-SSL/TLS network traffic.
 2015-01-16 06:09:05 +00:00
Jeff Sharkey
c2ae6fb9ad Merge commit '605eb79c9519307147fc1795d0eb155638a7f542' into manualmerge 
Change-Id: Id6db8cce3a477572478a1d50f624823200848896
 2015-01-15 21:27:13 -08:00
Craig Mautner
8667eff6b8 Merge "Remove unused method moveTaskToBack." 2015-01-16 01:54:59 +00:00
Craig Mautner
428ecf2966 Remove unused method moveTaskToBack. 
Everyone uses moveActivityTaskToBack() instead.

Fixes item #3 of bug 18088522.

Change-Id: I16028335fe1eef8a2aa47804f46536e395a16d8c
 2015-01-15 17:20:40 -08:00
Craig Mautner
c62d355b3f am b523c55d: am 41d54237: am 92cf3608: Merge "Debug for bug 18201239." into lmp-mr1-dev 
* commit 'b523c55d76ef3215538158a65bdea70c9897993e':
  Debug for bug 18201239.
 2015-01-16 00:06:29 +00:00
Jeff Sharkey
605eb79c95 Offer to detect non-SSL/TLS network traffic. 
Introduces new module that provides network-related features for
the StrictMode developer API.  The first feature offers to detect
sockets sending data not wrapped inside a layer of SSL/TLS
encryption.

When a developer enables, we ask netd to watch all outgoing traffic
from our UID, and penalize us accordingly if cleartext sockets are
detected.  When enabled, netd captures the offending packet and
passes it back to the owning process to aid investigations.  When
death penalty is requested, all future traffic on the socket is
blocked, which usually results in a useful stacktrace before the
app is actually killed.

Bug: 18335678
Change-Id: I3adbc974efd8d3766b4b1a23257563bb82d53c29
 2015-01-15 15:59:03 -08:00
Todd Kennedy
28432f0360 Merge "Rename the binder call createActivityContainer" 2015-01-15 23:37:22 +00:00
Craig Mautner
b523c55d76 am 41d54237: am 92cf3608: Merge "Debug for bug 18201239." into lmp-mr1-dev 
* commit '41d54237380d5f3c06ab2a71715e22f048278ecf':
  Debug for bug 18201239.
 2015-01-15 23:30:41 +00:00
Todd Kennedy
ca4d842205 Rename the binder call createActivityContainer 
Change the call to createVirtualActivityContainer to better describe what's
actually being created with the call.

Change-Id: Id3a32df19a5bb6740cbabcd65897349e9f2f2946
 2015-01-15 15:22:17 -08:00
Craig Mautner
92cf3608b8 Merge "Debug for bug 18201239." into lmp-mr1-dev 2015-01-15 23:18:40 +00:00
Craig Mautner
9776ad41b9 Debug for bug 18201239. 
Change-Id: I06281bd76b8c1d887324d3efa39b6cb11c9e71ae
 2015-01-15 14:38:39 -08:00
Christopher Tate
33194035a5 am 49138184: am 9568307c: am 43a4a8c7: Fix redundant file backups 
* commit '49138184dee54357b1923f302e4b3fedd73ca34f':
  Fix redundant file backups
 2015-01-15 04:30:34 +00:00
Christopher Tate
49138184de am 9568307c: am 43a4a8c7: Fix redundant file backups 
* commit '9568307cf32c8abc6703dc7a1b0b0fee56c4f8f5':
  Fix redundant file backups
 2015-01-15 01:39:29 +00:00
Christopher Tate
43a4a8c777 Fix redundant file backups 
We'd observed a bug in which an unchanged file was nevertheless
being redundantly transmitted for backup on every backup pass.
The underlying issue turns out to have been the FileBackupHelper
base implementation's logic for diffing the prior-state file
set against the current state, in the case when there had been
deletions of prior files.  In addition, there was also a
parallel bug in which file checksums were not calculated
properly in some cases, leading to at least one additional
redundant backup of the file in question.

Bug 18694053

Change-Id: Ie0dec06486b5fef4624561737019569c85d6b2a0
 2015-01-14 16:36:30 -08:00
Jorim Jaggi
568e54be71 resolve merge conflicts of 87f5369 to master. 
Change-Id: I5d1a7aaf48c4bf70f7181508aa46fbbcc2cf7086
 2015-01-15 00:12:18 +01:00
Nicolas Prevot
f23f355645 am 206d31f5: am 42ebaa43: Merge "Make documentation for cross-profile intent filters clearer." into lmp-mr1-dev 
* commit '206d31f598d499dd5a8659235afada35c3417f94':
  Make documentation for cross-profile intent filters clearer.
 2015-01-14 19:24:16 +00:00
Nicolas Prevot
2c1c5dd5ef Make documentation for cross-profile intent filters clearer. 
Explain why FLAG_MANAGED_CAN_ACCESS_PARENT and FLAG_PARENT_CAN_ACCESS_MANAGED
have these names.
Also do not mention the disambiguation list since there is not always a
disambiguation list shown when resolving cross-profile intent filters.

BUG:18962528

Change-Id: Ibbb9505dcab7cf17d87435eff2cef3e745e95209
 2015-01-14 10:31:23 +00:00
Alan Viverette
b2b98a00e1 Force-commit changes on accept in spinner-style DatePickerDialog 
Bug: 19005472
Change-Id: If500c7305282a5055b4617c242871e04d91c0bc3
 2015-01-13 17:34:17 -08:00
Craig Mautner
91934a3b2f am 19c549fc: am 1e263d3f: am 66b4d484: Merge "Prevent system server dump stuck by pipe buffer full." 
* commit '19c549fc735bf8a1df5cccb6cc0cdf46c7d242a4':
  Prevent system server dump stuck by pipe buffer full.
 2015-01-13 20:33:08 +00:00
Olawale Ogunwale
be37df395e am 9d293911: am ebdfb6e8: Merge "[ActivityManager] Distinguish FG or BG receiver finished" 
automerge: 0f8ecc8

* commit '0f8ecc84c8b86054bfd3275f942c3a705df01fbb':
  [ActivityManager] Distinguish FG or BG receiver finished
 2015-01-13 20:19:57 +00:00
Craig Mautner
19c549fc73 am 1e263d3f: am 66b4d484: Merge "Prevent system server dump stuck by pipe buffer full." 
* commit '1e263d3f140e90966790875a815f23c92550f2f2':
  Prevent system server dump stuck by pipe buffer full.
 2015-01-13 04:20:23 +00:00
Craig Mautner
66b4d48469 Merge "Prevent system server dump stuck by pipe buffer full." 2015-01-13 04:08:05 +00:00
Olawale Ogunwale
0f8ecc84c8 am 9d293911: am ebdfb6e8: Merge "[ActivityManager] Distinguish FG or BG receiver finished" 
* commit '9d293911221cac930eb8edfef01362ea083eeaab':
  [ActivityManager] Distinguish FG or BG receiver finished
 2015-01-12 16:44:28 +00:00
Olawale Ogunwale
ebdfb6e864 Merge "[ActivityManager] Distinguish FG or BG receiver finished" 2015-01-12 13:45:13 +00:00
Jeff Sharkey
df38a17020 am 2b46774f: Merge "Guard against MountService throwing NPE." into lmp-mr1-dev automerge: 0cb736f 
automerge: d6a8c32

* commit 'd6a8c32a6a2ac07f25f65622366ccb4ccffbdcdd':
  Guard against MountService throwing NPE.
 2015-01-09 19:29:24 +00:00