Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
181,591 Commits 3 Branches 0 Tags
3f514b5230d22e07ec434dbfcc512a97343a3a74
Commit Graph

5383 Commits

Author SHA1 Message Date
Ruben Brunk
35fa2bc2e4 Merge "Add ProcessInfoService to activity manager." 2015-02-03 20:23:04 +00:00
Wale Ogunwale
9d3de4cfb4 Support for activity to opt-in/out of resizeable/multi-window support. 
Bug: 19178148
Change-Id: I5819a71cdc48e0af4add11a6d4a503ec5cbe5d63
 2015-02-02 16:06:55 -08:00
Scott Kennedy
144ea46ce1 Merge "Add some @Nullable annotations to SharedPreferences" 2015-02-02 20:38:10 +00:00
Julia Reynolds
a9ec70ba17 Add skip encryption constants for device owner provisioning. 
Bug: 19228730
Change-Id: Id5022f2f669cf0dfc1b1523190da52c77238a02c
 2015-02-02 12:42:18 -05:00
Ruben Brunk
a27eef432a Add ProcessInfoService to activity manager. 
- Adds a new AIDL interface for querying process
  information from activity manager.

Bug: 19186859
Change-Id: Ic08858f346d6b66e7bfc9da6faa2c6e38d9b2e82
 2015-01-30 16:58:14 -08:00
Scott Kennedy
2333e3406c Add some @Nullable annotations to SharedPreferences 
Change-Id: I26e7a02a18d802902fca6892bed77b4f98ccf3ee
 2015-01-30 15:37:45 -08:00
Fyodor Kupolov
babdb0dc36 Merge "Removed userHandle from setXXX methods" 2015-01-30 19:21:10 +00:00
Winson Chung
0e0b7310a8 Merge "Adding some debug controls to test multi-window." 2015-01-30 18:43:19 +00:00
Fyodor Kupolov
bdc58c66af Removed userHandle from setXXX methods 
User handle is now extracted from UID of the calling process.

Previously setXXX methods may not work properly, if userHandle parameter
was different from a user of the calling process. In practice, this wouldn't
have happened because setters were always called with a userHandle of the
caller process.

Bug:17202572
Change-Id: I1c08c54c975a04b8c54719a1e280ad3cfaff2e67
 2015-01-29 17:54:06 -08:00
Winson Chung
d16c565a60 Adding some debug controls to test multi-window. 
Adding some preliminary controls to mirror the currently exposed api
to create new activity stacks, resize stacks, and to move tasks
between stacks.

Change-Id: I3fb51c248f53a1d4c4eb23ca9fb3a76888def1de
 2015-01-29 15:56:58 -08:00
Zhen Yu Song
72c85bbdf8 Merge "+ Add CarExtender to Notification Bug: 18316420" 2015-01-29 22:54:29 +00:00
Zhen Yu Song
9d5528ba9f + Add CarExtender to Notification 
Bug: 18316420

Change-Id: Idd7a06c2271d62c603014038fbe5a0bbacb0ed78
 2015-01-29 14:27:28 -08:00
Jose Lima
43181fb72d am 4a40f7cc: Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev automerge: 1f81973 
automerge: 485f6a6

* commit '485f6a60e0182767d57a5ab08d6438124a69439e':
  Fix crash caused by disabling the Options panel on TVs
 2015-01-28 21:32:37 +00:00
Jose Lima
485f6a60e0 am 4a40f7cc: Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev automerge: 1f81973 
* commit '4a40f7cc90d8f908527d2cfff32376ee51259250':
  Fix crash caused by disabling the Options panel on TVs
 2015-01-28 21:27:33 +00:00
Jose Lima
bd769a15ab Fix crash caused by disabling the Options panel on TVs 
Address more cases where calls to getPanelState may cause a crash when the
options panel is disabled on a platform.

Bug: 19178531
Bug: 18780696
Change-Id: Ib72bb8483e636181788ed3919c4cb9e99a94b7b1
 2015-01-28 10:46:39 -08:00
George Mount
206db8a70f am fff84a23: Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev automerge: aa6945a 
automerge: 5c25f5b

* commit '5c25f5b0a7de7c05e71a88373223d579c3823415':
  Activity Transition: fix quick back after enter.
 2015-01-27 23:30:18 +00:00
Wale Ogunwale
783f28691e Merge "Support activities in the same process having different resources." 2015-01-27 22:24:15 +00:00
Jose Lima
ceba619e36 am 445768bd: am 3fd8a433: Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev 
automerge: 69fbcf1

* commit '69fbcf1f100905f5a28909d561db4753189bd717':
  Allow disabling the Options Pannel feature for TVs
 2015-01-27 17:57:04 +00:00
Wale Ogunwale
60454dbc4d Support activities in the same process having different resources. 
Activities can be of various sizes in a multi-window environment.
This change allows them to have override configurations that allows
different resources to the loaded if needed.

Bug: 19002213
Change-Id: Ib2c7be0b427f5ce05e7a362bcdd496ddbc9164f0
 2015-01-27 07:50:58 -08:00
George Mount
5c25f5b0a7 am fff84a23: Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev automerge: aa6945a 
* commit 'fff84a232a964a8587eabee4e34cc38344309593':
  Activity Transition: fix quick back after enter.
 2015-01-27 15:21:23 +00:00
George Mount
aa6945ac79 Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev 2015-01-27 15:13:32 +00:00
Jose Lima
69fbcf1f10 am 445768bd: am 3fd8a433: Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev 
* commit '445768bddf00256195a46b78ed35ea3722df7c92':
  Allow disabling the Options Pannel feature for TVs
 2015-01-27 03:10:28 +00:00
Jose Lima
7a22fc62d3 Allow disabling the Options Pannel feature for TVs 
- Added a config entry in velues-television to disable the options panel
feature for TVs.
- Fixed parts of the code in PhoneWindow that assumed this feature is supposed
to always be available, which was causing exceptions when it was turned off.

Bug: 18780696
Change-Id: I923bd4b5019d634e5352a6e893005133edb475f6
 2015-01-26 17:39:49 -08:00
George Mount
fbd459642f Activity Transition: fix quick back after enter. 
Bug 19105460

When an Activity Transition was receiving an exit call
immediately after the enter, the transition for the enter
was still in progress. TransitionManager does not allow
multiple transitions to work at once, so the enter transition
would run, but the exit did not. This CL detects when the
enter transition is still pending and tells the
ActivityTransitionState to delay one frame so that the
enter can finish its required work prior to starting the
exit transition.

Change-Id: I1b40f1e41d61a67da3fd672419ea321e7d0496da
 2015-01-26 15:59:42 -08:00
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