drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
181,612 Commits 1 Branch 0 Tags
Commit Graph

7247 Commits

Author SHA1 Message Date
Wale Ogunwale
1cfec7c3de Merge "Fixed issue with resized stack sticking to the top of the screen." 2015-02-04 00:29:21 +00:00
Wale Ogunwale
dd11d4d6d3 Fixed issue with resized stack sticking to the top of the screen. 
WindowState.mUnderStatusBar wasn't set correctly when the stack was
resized before the window was added to it. Changed to use
TaskStack.mUnderStatusBar instead which will always have the
correct answer.

Bug: 19204013
Change-Id: Ib4660302c6a2aebd47bff354c1efab93a1e1a255
 2015-02-03 16:09:02 -08:00
Paul Jensen
a3a8b3131c am f1b78d04: Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev automerge: 39ae054 
automerge: b35275a

* commit 'b35275a25e1a0775458fcbda5b6e8180a0e3311a':
  Facilitate network validation on networks with a per-network PAC.
 2015-02-03 21:22:00 +00:00
Paul Jensen
b35275a25e am f1b78d04: Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev automerge: 39ae054 
* commit 'f1b78d046965f91c2e03d541cba4c91ea707111a':
  Facilitate network validation on networks with a per-network PAC.
 2015-02-03 21:17:09 +00:00
Paul Jensen
f1b78d0469 Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev 
automerge: 39ae054

* commit '39ae0547ca5a1e7cfe24a945b2f8a910e09b7f3c':
  Facilitate network validation on networks with a per-network PAC.
 2015-02-03 21:11:51 +00:00
Ruben Brunk
35fa2bc2e4 Merge "Add ProcessInfoService to activity manager." 2015-02-03 20:23:04 +00:00
Craig Mautner
42da895b90 Merge "[ActivityManager] Prevent application holding AMS lock" automerge: 53e8d6f automerge: 6112f63 
automerge: e8bd6d7

* commit 'e8bd6d734ccef685c4e25a0ec1735c140b9fe644':
  [ActivityManager] Prevent application holding AMS lock
 2015-02-03 18:52:59 +00:00
Craig Mautner
e8bd6d734c Merge "[ActivityManager] Prevent application holding AMS lock" automerge: 53e8d6f 
automerge: 6112f63

* commit '6112f63369c7ba463c0384c73a4e4c0d45b63918':
  [ActivityManager] Prevent application holding AMS lock
 2015-02-03 18:48:29 +00:00
Craig Mautner
53e8d6f934 Merge "[ActivityManager] Prevent application holding AMS lock" 2015-02-03 18:41:14 +00:00
Craig Mautner
b95a8abcaf am c0e9c1d0: am 240e8743: Merge "[ActivityManager] Set appropriate relation of task to home" automerge: 7d1aded 
* commit 'c0e9c1d0a405c66e7ec75eb6268f84fe1d466344':
  [ActivityManager] Set appropriate relation of task to home
 2015-02-03 18:09:38 +00:00
Craig Mautner
c0e9c1d0a4 am 240e8743: Merge "[ActivityManager] Set appropriate relation of task to home" 
automerge: 7d1aded

* commit '7d1adede2fbea8f4c0ad92214bee16395498dd07':
  [ActivityManager] Set appropriate relation of task to home
 2015-02-03 18:04:32 +00:00
Craig Mautner
240e874397 Merge "[ActivityManager] Set appropriate relation of task to home" 2015-02-03 17:54:27 +00:00
Tony Mantler
338026f59a Merge "Check NAVIGATION_NONAV in ActivityManagerService" 2015-02-03 17:50:17 +00:00
Wale Ogunwale
f5db946ffa Merge "Support for activity to opt-in/out of resizeable/multi-window support." 2015-02-03 17:16:16 +00:00
Paul Jensen
8fe1742946 Facilitate network validation on networks with a per-network PAC. 
On networks with a per-network PAC, Network.openConnection(URL) will
fetch using NO_PROXY.  This will fail on networks where Internet
access is only permitted via the proxy.  Always failing network
validation has the potential to disable WiFi auto-join.  Instead
of performing the normal connectivity check, instead attempt to
fetch the PAC, as this is meant to succeed with NO_PROXY.

bug:19143573
Change-Id: Ia482f5c046d338c27daf42571f20851dfa36671c
 2015-02-03 11:28:55 -05: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
RoboErik
7b3da2d415 Fix crash in dumpsys media_session 
Changes the dump to use the correct keys instead of just counting
when doing a dump of users.

Change-Id: Ibb2033f1cc9209fff03e5cf4928acacca29fc11b
 2015-02-02 15:23:59 -08:00
Tony Mantler
843ce5b2a2 Check NAVIGATION_NONAV in ActivityManagerService 
b/18733457

Change-Id: I12b4d1da3564129a445882025575d759fc80d6d2
 2015-02-02 14:27:44 -08:00
destradaa
22287fe7c2 Merge "Fix race condition generating READY and NOT_SUPPORTED statuses." 2015-02-02 18:07:41 +00: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
Jinsuk Kim
266fd264db am 42e785fb: am 3457ae47: Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev 
automerge: 7bc0929

* commit '7bc0929905fa5964a6f9a5b0b059153dc8cdd69d':
  Revert "CEC: Let playback device switch TV input after bootup"
 2015-01-30 22:16:46 +00:00
Jinsuk Kim
7bc0929905 am 42e785fb: am 3457ae47: Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev 
* commit '42e785fbf7dfa50096275cf1e6233247e9fc15f7':
  Revert "CEC: Let playback device switch TV input after bootup"
 2015-01-30 22:15:00 +00:00
Jinsuk Kim
42e785fbf7 am 3457ae47: Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev 
* commit '3457ae4709c8444f8ff9cdaf5809d6164f3bd21a':
  Revert "CEC: Let playback device switch TV input after bootup"
 2015-01-30 22:06:09 +00:00
Jinsuk Kim
3457ae4709 Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev 2015-01-30 22:00:40 +00:00
Jinsuk Kim
4361549891 Revert "CEC: Let playback device switch TV input after bootup" 
This reverts commit 8913a0e1e8559d96e82b1ff408dd312ed279021b.

Change-Id: Ibfabdd94206141274a69040e0ed90ba29aeae75b
 2015-01-30 21:58:18 +00:00
Dianne Hackborn
bd39d50624 Merge "Record memory data in event log as we collect it for procstats." 2015-01-30 21:51:35 +00:00
RoboErik
ddce02f3b9 Merge "Move mute/unmute handling to adjust volume paths" 2015-01-30 18:55:10 +00:00
Winson Chung
0e0b7310a8 Merge "Adding some debug controls to test multi-window." 2015-01-30 18:43:19 +00:00
Todd Kennedy
14dc3c900f Merge "Don't get extras from the Intent" 2015-01-30 17:59:19 +00:00
Todd Kennedy
aab56dbc1e Show stacks underneath a resized stack 
When a stack is resized, make sure any non-fullscreen stack beneath it
becomes visible. This may mean additional activities are resumed in the
process.

Bug: 19083171
Change-Id: I5e7a3f82d76932ea2b9dbf0324ea183c42ee5496
 2015-01-30 09:39:53 -08:00
Dianne Hackborn
1a5da04902 Record memory data in event log as we collect it for procstats. 
Change-Id: I37d6d87aac0c400ea402ae20e6174fd851d3c1f9
 2015-01-29 17:45:26 -08:00
Dianne Hackborn
e322d1253c Merge "Improve messaging of pre boot apps." 2015-01-30 01:27:21 +00:00
Dianne Hackborn
a92cbad2a9 Improve messaging of pre boot apps. 
Have the system take care of showing the boot message
as it runs pre boot apps, rather than relying on them
doing this on their own.

Change-Id: Ife6db0691907cf413311dafb4b023e63e8795a79
 2015-01-29 17:22:25 -08:00
RoboErik
4197cb60bc Move mute/unmute handling to adjust volume paths 
This deprecates the setStreamMute and setStreamSolo APIs. Soloing is no
longer supported and muting is redirected through the adjust volume APIs.

Also updates the hidden master versions of these APIs.

Change-Id: I65d2a5d5fc15b386bd497abf8ca6869fec75a26a
 2015-01-29 16:14:30 -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
Jinsuk Kim
1b68ce327a am 7bf039b6: am 9c5ccc36: Merge "CEC: Discard key event to itself" into lmp-mr1-dev 
automerge: a6fc42a

* commit 'a6fc42aec58ab0d2dbb96f37d40e597bc39631fa':
  CEC: Discard key event to itself
 2015-01-29 22:46:33 +00:00
Jinsuk Kim
a6fc42aec5 am 7bf039b6: am 9c5ccc36: Merge "CEC: Discard key event to itself" into lmp-mr1-dev 
* commit '7bf039b67c89ac07a1b90d048bf1e4ff0e121ab8':
  CEC: Discard key event to itself
 2015-01-29 22:44:51 +00:00
Jinsuk Kim
7bf039b67c am 9c5ccc36: Merge "CEC: Discard key event to itself" into lmp-mr1-dev 
* commit '9c5ccc3684e55e0ce7f2940bd13dfd7acdf85895':
  CEC: Discard key event to itself
 2015-01-29 22:39:57 +00:00
Jinsuk Kim
f0569c1651 am 1ebbe916: am 3f923474: Merge "CEC: Add CEC device upon receiving <Report Physical Address>" into lmp-mr1-dev 
automerge: e7ff01e

* commit 'e7ff01ecc5c0ceda498dd476cb29ee663f1968dc':
  CEC: Add CEC device upon receiving <Report Physical Address>
 2015-01-29 22:39:52 +00:00
Jinsuk Kim
e7ff01ecc5 am 1ebbe916: am 3f923474: Merge "CEC: Add CEC device upon receiving <Report Physical Address>" into lmp-mr1-dev 
* commit '1ebbe9165842707fd575ea61b8158463f93c35be':
  CEC: Add CEC device upon receiving <Report Physical Address>
 2015-01-29 22:36:55 +00:00
Jinsuk Kim
9c5ccc3684 Merge "CEC: Discard key event to itself" into lmp-mr1-dev 2015-01-29 22:33:43 +00:00
Jinsuk Kim
454fab5219 CEC: Discard key event to itself 
Should discard keyevents if the target address is the device itself.

Bug: 19188660
Change-Id: Id47d79c996f60c9d90540f28c4b2509976d2f378
 2015-01-30 07:28:10 +09:00
Jinsuk Kim
1ebbe91658 am 3f923474: Merge "CEC: Add CEC device upon receiving <Report Physical Address>" into lmp-mr1-dev 
* commit '3f923474248e24706e7977a7512b0a35cff835a7':
  CEC: Add CEC device upon receiving <Report Physical Address>
 2015-01-29 22:25:57 +00:00
Jinsuk Kim
3f92347424 Merge "CEC: Add CEC device upon receiving <Report Physical Address>" into lmp-mr1-dev 2015-01-29 22:21:54 +00:00
Jinsuk Kim
031cb522a3 am a6a01787: am 07600116: CEC: Ensure stable AVR connection 
automerge: b3bae9d

* commit 'b3bae9dc1a649eb326d17c2035c0f567b797edf3':
  CEC: Ensure stable AVR connection
 2015-01-29 07:18:36 +00:00
Jinsuk Kim
7054f543d6 am f4e4eb54: am 2ee0d6f4: CEC: Stop ARC if hotplug event is asserted low 
automerge: 6da2c66

* commit '6da2c666d258a0ac3d65b867d7443a3e3f8cded0':
  CEC: Stop ARC if hotplug event is asserted low
 2015-01-29 07:17:09 +00:00
Jinsuk Kim
46cbf0f474 am 0cbbfb2b: am 7640d989: CEC: Fix a regression bug 
automerge: 5b972d5

* commit '5b972d58cb9ccbbbc3302655f83b04ddd717c299':
  CEC: Fix a regression bug
 2015-01-29 07:15:44 +00:00
Jinsuk Kim
c87135946e am 5e34b6b9: am 43b2746b: Merge "CEC: Let <Active Source> from the active source work" into lmp-mr1-dev 
automerge: c8ece53

* commit 'c8ece533b2c19001d9ada319c1cf480ba97377d8':
  CEC: Let <Active Source> from the active source work
 2015-01-29 07:14:40 +00:00
Jinsuk Kim
b3bae9dc1a am a6a01787: am 07600116: CEC: Ensure stable AVR connection 
* commit 'a6a01787fb657189202dec096c30b3d2f63197dc':
  CEC: Ensure stable AVR connection
 2015-01-29 07:01:16 +00:00
Jinsuk Kim
6da2c666d2 am f4e4eb54: am 2ee0d6f4: CEC: Stop ARC if hotplug event is asserted low 
* commit 'f4e4eb5401135fdc374d83317771ed87d1caeb86':
  CEC: Stop ARC if hotplug event is asserted low
 2015-01-29 07:01:11 +00:00