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

24719 Commits

Author SHA1 Message Date
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
Fyodor Kupolov
babdb0dc36 Merge "Removed userHandle from setXXX methods" 2015-01-30 19:21:10 +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
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
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
Christopher Tate
7af25c0515 am 7041420d: am 9b36d111: am b71ac193: Merge "Don\'t run full-data backups when backup is disabled" into lmp-mr1-dev 
* commit '7041420d9b0ca1e0f79157ccace48ac4e29adc29':
  Don't run full-data backups when backup is disabled
 2015-01-30 00:21:25 +00:00
Christopher Tate
7041420d9b am 9b36d111: am b71ac193: Merge "Don\'t run full-data backups when backup is disabled" into lmp-mr1-dev 
* commit '9b36d1117a2f0eb0402b0f9dda8bc5d94b110061':
  Don't run full-data backups when backup is disabled
 2015-01-30 00:17:19 +00: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
Christopher Tate
9b36d1117a am b71ac193: Merge "Don\'t run full-data backups when backup is disabled" into lmp-mr1-dev 
* commit 'b71ac193087dc768a25cebb0f06f0ccbb66e8ba9':
  Don't run full-data backups when backup is disabled
 2015-01-30 00:11:59 +00:00
Christopher Tate
b71ac19308 Merge "Don't run full-data backups when backup is disabled" into lmp-mr1-dev 2015-01-30 00:06:18 +00: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
Christopher Tate
e77c12ba37 Don't run full-data backups when backup is disabled 
If the scheduled job fires but backup is disabled or the device is
not yet provisioned (i.e. has not yet finished going through setup),
bow out gracefully without running any backup operations.  Also, even
if a backup is directly invoked (e.g. via adb), verify again right
before we start collecting app data, and abandon the operation in
that path as well.

(This is redundant; having only the latter test would suffice, but
this lets us distinguish in the logging more easily.)

Finally, make sure that if we were waiting on setup before permitting
backup operations to begin, that we startup the full-data scheduling
as well as the [separate] key/value scheduling.

Bug 19197062

Change-Id: I3d8fb650c50f946d8ed7ac7170df361c707f2528
 2015-01-29 15:47:43 -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
Mike Lockwood
51936d4260 Merge "UsbAlsaManager: Don't reselect current USB audio device on all USB disconnects" 2015-01-29 21:33:32 +00:00
Mike Lockwood
2a57bc7fd6 MidiManager: Add USB peripheral MIDI support 
This allows the android device to appear as a USB MIDI device to
a USB host (like a Mac or a PC) using the f_midi USB gadget driver.

Change-Id: I14f1ba73bcce2c894e77efb8810beac4ffe246d8
 2015-01-29 12:59:28 -08:00
Mike Lockwood
9c2d34c764 UsbAlsaManager: Don't reselect current USB audio device on all USB disconnects 
Change-Id: I4d3a0d803a6d1eb02ff48a7e8587a1ff6c66a500
 2015-01-29 10:41:26 -08:00
Mike Lockwood
3b7549ee1f Merge "MIDI Manager: Remove message packetization from MIDI transport" 2015-01-29 17:11:55 +00:00
Mike Lockwood
cb09627373 MIDI Manager: Remove message packetization from MIDI transport 
Instead of attempting to package exactly one MIDI message in each call to
MidiReceiver.onPost(), we now pass messages as a raw stream of bytes.
This means we may now receive multiple MIDI messages in MidiReceiver.onPost().

We make this change to avoid the complexity of taking the single message approach
with SysEx and realtime messages. This shifts some of the burden of parsing
MIDI messages to the client application. But the parsing is best handled in the
application anyway, rather than having the framework impose its own policy
on how the messages are parsed.

Change-Id: Idb6c200037f827cc618bc7d9455a7aa864b494a7
 2015-01-29 09:09:00 -08: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
Jinsuk Kim
5b972d58cb am 0cbbfb2b: am 7640d989: CEC: Fix a regression bug 
* commit '0cbbfb2beab0cf63521e59904db31661a4832531':
  CEC: Fix a regression bug
 2015-01-29 06:55:26 +00:00
Jinsuk Kim
c8ece533b2 am 5e34b6b9: am 43b2746b: Merge "CEC: Let <Active Source> from the active source work" into lmp-mr1-dev 
* commit '5e34b6b9af93a50354a31f900455ec24e79c2528':
  CEC: Let <Active Source> from the active source work
 2015-01-29 06:55:19 +00:00
Jinsuk Kim
a6a01787fb am 07600116: CEC: Ensure stable AVR connection 
* commit '07600116b59e2accd1e95b9029c2c9819cd76c5a':
  CEC: Ensure stable AVR connection
 2015-01-29 06:54:15 +00:00
Jinsuk Kim
f4e4eb5401 am 2ee0d6f4: CEC: Stop ARC if hotplug event is asserted low 
* commit '2ee0d6f44d7274bb1846cc6ff7a60451539a2b51':
  CEC: Stop ARC if hotplug event is asserted low
 2015-01-29 06:54:11 +00:00
Jinsuk Kim
07600116b5 CEC: Ensure stable AVR connection 
Make sure AVR device removal due to hotplug detection failure occur
in a less strict manner - doing it only if the failure is detected
3 times in a row.

Bug: 19171321
Change-Id: I1479663b05cdc957cc52123799c756f6b74f6708
 2015-01-29 06:47:34 +00:00
Jinsuk Kim
0cbbfb2bea am 7640d989: CEC: Fix a regression bug 
* commit '7640d9895cf8fae7a99a7db5bba0079ba6022621':
  CEC: Fix a regression bug
 2015-01-29 06:46:43 +00:00
Jinsuk Kim
5e34b6b9af am 43b2746b: Merge "CEC: Let <Active Source> from the active source work" into lmp-mr1-dev 
* commit '43b2746bcdfb49aed255ac0f6dd6fb95909dcfc1':
  CEC: Let <Active Source> from the active source work
 2015-01-29 06:46:39 +00:00
Jinsuk Kim
2ee0d6f44d CEC: Stop ARC if hotplug event is asserted low 
Updated to stop ARC as specified in HEAC 2.4 transmission condition.

Bug: 19170947
Change-Id: Ibf797ce3b49f32561ef0c36b6874e7ebe19ed65a
 2015-01-29 06:45:02 +00:00