Dan Sandler
f13cdabb93
am 61681416: am 00c3f554: am 8bfa8dbc: Defend against null ApplicationInfos.
...
* commit '616814161410d9794d7de89a5f04742f74e622eb':
Defend against null ApplicationInfos.
2014-07-21 19:21:38 +00:00
Wonsik Kim
58ba7fa3a9
am 168ec8b1: am 39ac147e: am 20c790cf: Merge "TIF: fix indexOfValue usage" into lmp-dev
...
* commit '168ec8b13227d9756dc4c49c3a0cd20a5f627776':
TIF: fix indexOfValue usage
2014-07-21 19:21:32 +00:00
Jungshik Jang
b66de10fa4
am 353dcd70: am 13dc029e: am 7506f4c9: Merge "Add two apis for one touch record." into lmp-dev
...
* commit '353dcd7034fa69f8061c2079be5523f5b4102387':
Add two apis for one touch record.
2014-07-21 19:21:06 +00:00
Ji-Hwan Lee
166ff6cc6d
am 6ed883cf: am 1dc7352e: am d0f94173: Merge "TIF: Extend multiple TV input per service for HDMI logical devices" into lmp-dev
...
* commit '6ed883cf469c99e45d4a53a5fd5b6e9fc7503fb4':
TIF: Extend multiple TV input per service for HDMI logical devices
2014-07-21 19:21:02 +00:00
Jungshik Jang
5013b471b0
am d33d1732: am a86a6f2c: am 9d42d1f3: Merge "Do no send <Feature Abort> as response of <Feature Abort>" into lmp-dev
...
* commit 'd33d1732261446120fe85b67acde7097870d5b09':
Do no send <Feature Abort> as response of <Feature Abort>
2014-07-21 19:20:47 +00:00
Jinsuk Kim
be3b63668a
am d01a0137: am d4a48882: am 2a1ff5ad: Merge "Invoke callback for HdmiControlService.deviceSelect() for internal source" into lmp-dev
...
* commit 'd01a01374b6407c34b4b30ad74db25299f36fc07':
Invoke callback for HdmiControlService.deviceSelect() for internal source
2014-07-21 19:20:43 +00:00
Jinsuk Kim
d94922f968
am a5c8b021: am e51029b9: am 1e6393b8: Merge "TIF: Register IHdmiInputChangeListener to physical input manager" into lmp-dev
...
* commit 'a5c8b021023b786f918ee2bef33b99272f130628':
TIF: Register IHdmiInputChangeListener to physical input manager
2014-07-21 19:20:33 +00:00
Jae Seo
a06dd24bcf
am 31f31f10: am 0e29adb6: am bf1a0ff0: TIF: Add sendAppPrivateCommand()
...
* commit '31f31f10de63b562b2137c7ca7b22472bfb9a7e3':
TIF: Add sendAppPrivateCommand()
2014-07-21 19:20:18 +00:00
Dianne Hackborn
526e843499
am 65f62f23: am 39285ff1: am 1648dbb4: Merge "Fix issue #16400873 : Apps that show ads as new tasks stay in recents..." into lmp-dev
...
* commit '65f62f236395b44a0c168f1ec72855197927a885':
Fix issue #16400873 : Apps that show ads as new tasks stay in recents...
2014-07-21 19:19:18 +00:00
Jean-Michel Trivi
e093bc6faf
am 1b357e1f: am 50c7e24f: am c741502b: Merge "Rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE" into lmp-dev
...
* commit '1b357e1f8cef221bbbf0029ac72bf6a0a87784cb':
Rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE
2014-07-21 19:18:58 +00:00
Wonsik Kim
af377def96
am 2c1c0a74: am e2d65e08: am 9b44c8b6: Merge "TIF: revise API names" into lmp-dev
...
* commit '2c1c0a74df0751556ad889e37e51e1523f9a6e21':
TIF: revise API names
2014-07-21 18:27:14 +00:00
John Spurlock
999b83af8b
am 4704c806: am 3897183d: am c297b9b3: Zen mode filtering should use new usage constants.
...
* commit '4704c8067743f36df6fc9622090f422e6bdec2c5':
Zen mode filtering should use new usage constants.
2014-07-21 18:24:58 +00:00
Wonsik Kim
0c585845fe
am afa87298: am 1042ee6b: am b872b220: Merge "TIF: misc fix for TvInputHal" into lmp-dev
...
* commit 'afa8729857c54b746d23804e077aa6034b47cce3':
TIF: misc fix for TvInputHal
2014-07-21 18:24:43 +00:00
Jeff Brown
e53b1eb276
am 5fbc6cae: am 958361e9: am 25892fe6: Merge "Allow dreams to wake up gently." into lmp-dev
...
* commit '5fbc6cae0c643be46de3c7c720c8e26a182514fa':
Allow dreams to wake up gently.
2014-07-21 18:24:33 +00:00
Jeff Brown
1d95978423
am 22193893: am 610014e6: am 03fb5270: Add new Display.STATE_DOZE_SUSPEND power state.
...
* commit '22193893f7a79f1351caf157a8d6932e7ec3c825':
Add new Display.STATE_DOZE_SUSPEND power state.
2014-07-21 18:24:21 +00:00
Jae Seo
dbff278e83
am e3576308: am c936967b: am 0c2b6c52: Merge "TIF: Add a way to notify whether the current program content is allowed" into lmp-dev
...
* commit 'e3576308987b508384c8689940ec71fbfb39b580':
TIF: Add a way to notify whether the current program content is allowed
2014-07-21 18:24:15 +00:00
Christopher Tate
24f448d7b3
am 0eebcfd7: am 32523262: am 12e9b896: Fix which index goes where
...
* commit '0eebcfd7582d576110a42acb799b8a8c639f693f':
Fix which index goes where
2014-07-21 18:22:33 +00:00
Dan Sandler
5854500459
am 00c3f554: am 8bfa8dbc: Defend against null ApplicationInfos.
...
* commit '00c3f554f17f0a82f0feca9013de804426c149de':
Defend against null ApplicationInfos.
2014-07-21 13:21:57 +00:00
Dan Sandler
09afc2e4ea
Defend against null ApplicationInfos.
...
Bug: 16303792
Change-Id: Id2d7a70f92718ecda8e3ff418c4e109f6982a75f
2014-07-21 13:11:17 +00:00
Wonsik Kim
f8f1c49e7a
am 39ac147e: am 20c790cf: Merge "TIF: fix indexOfValue usage" into lmp-dev
...
* commit '39ac147e42ccaf1fc5450fc81572231a7e6b3449':
TIF: fix indexOfValue usage
2014-07-21 13:05:03 +00:00
Jungshik Jang
e2879e5977
am 13dc029e: am 7506f4c9: Merge "Add two apis for one touch record." into lmp-dev
...
* commit '13dc029e32c3a8fbe1e87dfa0387ad303b0e83ba':
Add two apis for one touch record.
2014-07-21 12:40:15 +00:00
Ji-Hwan Lee
d6dbca92c0
am 1dc7352e: am d0f94173: Merge "TIF: Extend multiple TV input per service for HDMI logical devices" into lmp-dev
...
* commit '1dc7352eacde37dac5459f0bc82c868e9548b521':
TIF: Extend multiple TV input per service for HDMI logical devices
2014-07-21 12:40:10 +00:00
Jungshik Jang
35fb483a8f
am a86a6f2c: am 9d42d1f3: Merge "Do no send <Feature Abort> as response of <Feature Abort>" into lmp-dev
...
* commit 'a86a6f2c03959cb5a2d5fbde96fdf42246ab43de':
Do no send <Feature Abort> as response of <Feature Abort>
2014-07-21 12:40:02 +00:00
Jinsuk Kim
b018fd8d96
am d4a48882: am 2a1ff5ad: Merge "Invoke callback for HdmiControlService.deviceSelect() for internal source" into lmp-dev
...
* commit 'd4a48882cca68b99cc4336257b831ccdd8ec6e6d':
Invoke callback for HdmiControlService.deviceSelect() for internal source
2014-07-21 12:39:58 +00:00
Jinsuk Kim
27da640f12
am e51029b9: am 1e6393b8: Merge "TIF: Register IHdmiInputChangeListener to physical input manager" into lmp-dev
...
* commit 'e51029b9046dfbb15f1e72ad7a20d5959fa79ee9':
TIF: Register IHdmiInputChangeListener to physical input manager
2014-07-21 12:39:49 +00:00
Jae Seo
a725e79325
am 0e29adb6: am bf1a0ff0: TIF: Add sendAppPrivateCommand()
...
* commit '0e29adb65b8eea3092370862db329eac195bcd35':
TIF: Add sendAppPrivateCommand()
2014-07-21 12:39:37 +00:00
Jae Seo
a759b111a1
TIF: Add sendAppPrivateCommand()
...
Added a way to send a private command from the application to the TV
input. This can be used to provide domain-specific features that are
only known between certain TV inputs and their clients.
Change-Id: I7548311a64147b8ff27562ec680b941e2ec10bc0
2014-07-20 19:16:15 -07:00
Dianne Hackborn
767912d738
am 39285ff1: am 1648dbb4: Merge "Fix issue #16400873 : Apps that show ads as new tasks stay in recents..." into lmp-dev
...
* commit '39285ff113de9cbeb0304942f318f0f48ee697f3':
Fix issue #16400873 : Apps that show ads as new tasks stay in recents...
2014-07-20 23:06:56 +00:00
Jean-Michel Trivi
6e0683f4dd
am 50c7e24f: am c741502b: Merge "Rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE" into lmp-dev
...
* commit '50c7e24f3a10fa4bc15f7a8b2f4bab2ae91459e0':
Rename USAGE_NOTIFICATION_TELEPHONY_RINGTONE
2014-07-20 22:38:01 +00:00
Wonsik Kim
52d820ab29
am e2d65e08: am 9b44c8b6: Merge "TIF: revise API names" into lmp-dev
...
* commit 'e2d65e08ad9533ab5d94b52dd61d40cd6643a61f':
TIF: revise API names
2014-07-20 18:09:10 +00:00
John Spurlock
eaeac08489
am 3897183d: am c297b9b3: Zen mode filtering should use new usage constants.
...
* commit '3897183d7bd884c4a01b22dccce75df48e93ab4a':
Zen mode filtering should use new usage constants.
2014-07-20 18:04:06 +00:00
Wonsik Kim
8f199a44fd
am 1042ee6b: am b872b220: Merge "TIF: misc fix for TvInputHal" into lmp-dev
...
* commit '1042ee6be6294ad07ccda31571641996abc88bde':
TIF: misc fix for TvInputHal
2014-07-20 18:03:49 +00:00
Jeff Brown
3ab509a29b
am 958361e9: am 25892fe6: Merge "Allow dreams to wake up gently." into lmp-dev
...
* commit '958361e92371fd7d3b40fbbd91077ec4d7abe374':
Allow dreams to wake up gently.
2014-07-20 18:03:35 +00:00
Jeff Brown
253aa5d458
am 610014e6: am 03fb5270: Add new Display.STATE_DOZE_SUSPEND power state.
...
* commit '610014e6501d3543f33aedcc7f302288afcc4df4':
Add new Display.STATE_DOZE_SUSPEND power state.
2014-07-20 18:03:26 +00:00
Jae Seo
aa75604f2c
am c936967b: am 0c2b6c52: Merge "TIF: Add a way to notify whether the current program content is allowed" into lmp-dev
...
* commit 'c936967b84ef7ba70f948bcd99b8355fbdd3c9a4':
TIF: Add a way to notify whether the current program content is allowed
2014-07-20 18:03:09 +00:00
Christopher Tate
a1fd6bc661
am 32523262: am 12e9b896: Fix which index goes where
...
* commit '32523262b62c4598ffd50873d290c1c601b9f842':
Fix which index goes where
2014-07-20 17:59:46 +00:00
Prashant Malani
f47665c1be
am af5f3b92: am c61f26fa: Make the booting flag update unconditional
...
* commit 'af5f3b92a7acec0301067ed1cdad857056326e3b':
Make the booting flag update unconditional
2014-07-20 02:18:41 +00:00
Adam Lesinski
c2332a4d00
am b11e7d48: am e0b92a6b: First iteration of a public UsageStats API
...
* commit 'b11e7d48398c8e6e57578dabcf71eeef6a4e8bfd':
First iteration of a public UsageStats API
2014-07-20 02:17:49 +00:00
Robert Greenwalt
3052ccee23
am 8a717ee8: am 721252c0: Quit NetworkMonitors at end of life.
...
* commit '8a717ee8b26cdd6d916818451add978c1776bd6e':
Quit NetworkMonitors at end of life.
2014-07-20 02:17:01 +00:00
Jay Civelli
e15ecb21f4
Merge "Fix removeListener in TrustManagerService."
2014-07-19 22:40:06 +00:00
John Spurlock
7b41467704
Zen mode filtering should use new usage constants.
...
Refactor stream-based calls to usage-based calls.
Bug:15279516
Change-Id: I3f7757d8123c14670e2ad5f8e6aa4e9803efe7ec
2014-07-19 11:57:51 -04:00
Jeff Brown
5dc219142a
Add new Display.STATE_DOZE_SUSPEND power state.
...
Change-Id: Ia62f4f0d25234281dc600d0b7f08b3c6a312db7a
2014-07-18 21:28:18 -07:00
Christopher Tate
4a79daeaf7
Fix which index goes where
...
Change-Id: If4cf7efd4d7962eb5c10b487482653d86d92d2c6
2014-07-19 00:04:09 +00:00
Jay Civelli
979a32e4a0
Fix removeListener in TrustManagerService.
...
The removeListener method was not removing listeners.
Change-Id: Icd5366f03f8fc9c3d283c7b4416b9cff3c75cc59
2014-07-18 16:47:36 -07:00
Prashant Malani
84b08adcbb
Make the booting flag update unconditional
...
In case an Activity is started before we idle, there is a chance
the booting flag might never get updated.
Bug: 16015648
Change-Id: I46504bd126573e3a2ce1f914be922765ae9fe560
Conflicts:
services/core/java/com/android/server/am/ActivityStackSupervisor.java
2014-07-18 23:10:08 +00:00
Adam Lesinski
0debc9aff4
First iteration of a public UsageStats API
...
UsageStats API that allows apps to get a list of packages that have been
recently used, along with basic stats like how long they have been in
the foreground and the most recent time they were running.
Bug: 15165667
Change-Id: I2a2d1ff69bd0b5703ac3d9de1780df42ad90d439
2014-07-18 15:24:20 -07:00
Robert Greenwalt
1fd9aeef08
Quit NetworkMonitors at end of life.
...
We were creating and orphaning a thread for each network.
Cleanup after ourselves.
bug:16119890
Change-Id: I8c8a9fe471e43f31f712844915992084074e8047
2014-07-18 21:14:04 +00:00
Youngsang Cho
5bebd95959
am 2ec6fb80: am e94cfccd: Merge "TIF: Add unblock content" into lmp-dev
...
* commit '2ec6fb8085f78dceda26d1f1634f6e27b630166a':
TIF: Add unblock content
2014-07-18 19:00:10 +00:00
Youngsang Cho
e670d86ff9
am 7c8bbd53: am c28a86ff: Merge "TIF: Add onInputAdded and onInputRemoved" into lmp-dev
...
* commit '7c8bbd53c6622248377794a7ea6289b1c952a2f6':
TIF: Add onInputAdded and onInputRemoved
2014-07-18 19:00:05 +00:00
Jae Seo
31380e8424
Merge "TIF: Add a way to notify whether the current program content is allowed" into lmp-dev
2014-07-18 18:24:25 +00:00