183856 Commits

Author SHA1 Message Date
Andrew Lee
f3c10020e2 Add methods to indicate accessibility support.
Namely, indicates whether Telephony supports TTY mode or hearing
aid compatibility.

Bug: 19372734
Change-Id: I08d8cc64169b170c1dc6fb0c713e888eeba30099
2015-03-11 10:27:34 -07:00
Adam Lesinski
216f3edcb9 Merge "BatteryStats: Record energy info stats from WiFi and Bluetooth controllers" 2015-03-10 01:35:54 +00:00
Glenn Kasten
a080050e42 Merge "Revert "soundpool: reuse channel for same sample if available"" 2015-03-10 01:07:32 +00:00
Glenn Kasten
01771a9f7d Merge "Revert "soundpool: update sample rate when reusing audiotrack"" 2015-03-10 01:06:29 +00:00
Roozbeh Pournader
d1eca77c3c Merge "Fix: Drag handles are not shown for selection/insertion" 2015-03-10 01:06:03 +00:00
Andy Hung
0e9a8f6a8e Merge "Fix SoundPool playback of multichannel files." 2015-03-10 00:38:06 +00:00
Adam Lesinski
33dac55935 BatteryStats: Record energy info stats from WiFi and Bluetooth controllers
Surface some of this information in BatteryStatsHelper. If we are given a
total energy from the WiFi controller, we normalize the computed
energy of each app and blame them for a fraction of the real energy.

Change-Id: I64051b600f5d9f6ac4580d56ef0977971eb4be2d
2015-03-09 17:36:13 -07:00
Alan Viverette
b5c4623b7f Merge "Copy ViewPager and PagerAdapter into framework-internal widgets" 2015-03-10 00:22:39 +00:00
Eino-Ville Talvala
62d9670e98 Merge "Add DEPTH image formats, support in ImageReader" 2015-03-10 00:16:16 +00:00
Eric Laurent
68c265c74d Merge "enable FM tuner and hotword capture for system apps." 2015-03-10 00:06:12 +00:00
Adrian Roos
6f59787d2f Merge "Add prototype of Inline Reply behind debug flag" 2015-03-09 23:53:57 +00:00
Eino-Ville Talvala
805f3c9428 Add DEPTH image formats, support in ImageReader
- Add an explicit mapping between public ImageFormat/
  PixelFormat enums and internal HAL format/dataspace.
- Add DEPTH16 and DEPTH_POINT_CLOUD formats
- Wire up mapping layer to ImageReader to support depth
  formats

Change-Id: I8197eccef900cc91baddcfcb934ccd4d8c972eff
2015-03-09 16:42:25 -07:00
Eino-Ville Talvala
a72d640134 Merge "Camera2: Add hidden depth stream configuration tags" 2015-03-09 23:29:28 +00:00
Eino-Ville Talvala
7e443fbe85 Merge "Camera2: Remove unused parameters in ICameraDeviceUser#createStream" 2015-03-09 23:29:10 +00:00
Alan Viverette
f44b94c2ad Merge "Make TypedArray and LayoutInflater exceptions more useful" 2015-03-09 22:53:55 +00:00
Alan Viverette
75fd8f9fdc Copy ViewPager and PagerAdapter into framework-internal widgets
Converted all compat references to native implementations. Removed all
backwards compatibility SDK version checks.

Bug: 19431364
Change-Id: Ia79ed65bd2d041e4c0de6839b64707b9dba3ac22
2015-03-09 15:51:10 -07:00
Alan Viverette
93795053da Make TypedArray and LayoutInflater exceptions more useful
Include unresolved TypedValue data in TypedArray exceptions, wrap all
LayoutInflater exceptions with the parser position.

Bug: 19658760
Change-Id: I8965bdc4d0c58c082cb7129c3b692a3e5418cfdb
2015-03-09 15:32:50 -07:00
Adam Lesinski
488caeb702 Change WiFi and Bluetooth ActivityEnergyInfo classes
Have them take an elapsed time millis timestamp instead
of having the constructor call System.currentTimeMillis.

Change-Id: Ic9ca8f92347c336beee8ebcc3407de2c1e5b4073
2015-03-09 15:28:29 -07:00
Chris Craik
0a75d4e96c Merge "Rewrite glop texture asserts" 2015-03-09 20:40:08 +00:00
Dianne Hackborn
442361c500 Merge "Battery stats issues: fix jiffy handling, print scan counts." 2015-03-09 20:36:58 +00:00
Chris Craik
eb911c2b0e Rewrite glop texture asserts
bug:19641517

Also switch Glop VertexAttribFlags to use int for group of flags.

Change-Id: Ib7b1934197a62206a55baa6ab484ac59f5bec816
2015-03-09 13:36:35 -07:00
Eric Laurent
00a009204e enable FM tuner and hotword capture for system apps.
AudioRecord constructor with AudioAttributes and session ID as well
as HOTWORD and RADIO_TUNER audio sources are now system APIs.
Renamed MediaRecorder.AudioSource.FM_TUNER to
MediaRecorder.AudioSource.RADIO_TUNER.

Change-Id: I231c20c21e3e8cffe1837482976ebe284c9af541
2015-03-09 13:06:05 -07:00
John Spurlock
5844bd4096 Merge "AudioService: Fix device dump in dumpsys output." 2015-03-09 18:49:58 +00:00
John Spurlock
1ff1e6edf1 AudioService: Fix device dump in dumpsys output.
Bug: 19653026
Change-Id: Id09a502f1507477403c49be32ee0ed0f00ab288f
2015-03-09 14:46:18 -04:00
Dianne Hackborn
62793e4382 Battery stats issues: fix jiffy handling, print scan counts.
Issue #19431959: Framework incorrectly assumes that kernel
clock_ticks are 10ms

We now retrieve the time of a jiffy from the kernel, and all CPU
times are now handled in milliseconds.

Issue #19571810: Add per-app breakdown of number of WiFi scans
in batterystats checkin data

Added to the report (the information was already being tracked).

Change-Id: If1702d6b9bcf851704129f1811471e68ed576a5d
2015-03-09 11:15:41 -07:00
Eino-Ville Talvala
24c369e025 Camera2: Add hidden depth stream configuration tags
Change-Id: Iec1ceb894d90210bc3ab06acc92dcbbe42b74465
2015-03-09 11:15:31 -07:00
Eino-Ville Talvala
864005b026 Camera2: Remove unused parameters in ICameraDeviceUser#createStream
- width, height, format are unused

Change-Id: I26540aab1118108b0325df69cfa2dd23da41849b
2015-03-09 11:15:30 -07:00
Wale Ogunwale
3c36b8e956 resolved conflicts for merge of ca54b876 to master
Change-Id: I3148551b9809fb5c36007b26f26acf812b2f654d
2015-03-09 10:37:04 -07:00
Adrian Roos
497ab023f9 Add prototype of Inline Reply behind debug flag
The flag also extracts wear-only RemoteInput actions
to the normal set of actions under certain
circumstances to make this prototype actually useful.

Change-Id: Ide8bbef4e2ab82e2f152d32b143876ed309a8f21
2015-03-09 18:31:58 +01:00
Olawale Ogunwale
ca54b87657 am edc3c893: am 14ccc26f: Merge "[ActivityManager] Skip receiver precisely."
* commit 'edc3c8939f3cde4ab9343e7654f5dac1122fb470':
  [ActivityManager] Skip receiver precisely.
2015-03-09 16:43:16 +00:00
Olawale Ogunwale
edc3c8939f am 14ccc26f: Merge "[ActivityManager] Skip receiver precisely."
* commit '14ccc26f1ce006963f1a0b7a917404aa6a0e9da1':
  [ActivityManager] Skip receiver precisely.
2015-03-09 16:36:31 +00:00
Olawale Ogunwale
14ccc26f1c Merge "[ActivityManager] Skip receiver precisely." 2015-03-09 16:30:52 +00:00
Adrian Roos
93891686eb Merge "Remove leftover code causing trust agent issues" 2015-03-09 16:06:43 +00:00
Adrian Roos
e71a2be2ba Merge "Revert "Remove TrustAgent whitelisting API"" 2015-03-09 16:04:18 +00:00
Adrian Roos
7863658c98 Merge "Prevent receiver leak in TrustAgentWrapper" 2015-03-09 16:03:21 +00:00
Geoff Mendal
39a4e9de2d am e88afe3e: (-s ours) am 146990b7: (-s ours) Import translations. DO NOT MERGE
* commit 'e88afe3ee7b1944c8814f78f0eea41884d07600d':
  Import translations. DO NOT MERGE
2015-03-09 15:49:29 +00:00
Bryce Lee
2a18cbcffa am 1b8df04b: am 8aeab6c8: Allow the keyguard service to be configurable.
* commit '1b8df04b8d754f68dc6bfa6caa9e0a2666d16933':
  Allow the keyguard service to be configurable.
2015-03-09 15:49:23 +00:00
Bryce Lee
d3b28408d1 am 168d0ade: am 1e53b98c: Merge "Allow press and hold from non-interactive." into lmp-mr1-modular-dev
* commit '168d0ade0cb5a733c83d7dcfdf0a0efa3250cb16':
  Allow press and hold from non-interactive.
2015-03-09 15:49:13 +00:00
Glenn Kasten
18c225d054 Revert "soundpool: reuse channel for same sample if available"
This reverts commit 570576b51b8123ab05b36707ec752cf966292ca5.

Bug: 19635137
Change-Id: I8385ac4c151a375c19c3606698081c947b6216e3
2015-03-09 08:40:12 -07:00
Glenn Kasten
b801f73343 Revert "soundpool: update sample rate when reusing audiotrack"
This reverts commit a7d57a6f0068b1e2a0f07ca427cfba198b12a9b9.

Bug: 19635137
Change-Id: I1f53a432936dd3d51459e7d8cd86421bde399150
2015-03-09 08:39:46 -07:00
Geoff Mendal
e88afe3ee7 am 146990b7: (-s ours) Import translations. DO NOT MERGE
* commit '146990b7494c3fe6f47f6e8425ecb13f75007418':
  Import translations. DO NOT MERGE
2015-03-09 15:35:56 +00:00
Bryce Lee
1b8df04b8d am 8aeab6c8: Allow the keyguard service to be configurable.
* commit '8aeab6c8b9b89d77108fc05245561e33113fe27f':
  Allow the keyguard service to be configurable.
2015-03-09 15:35:38 +00:00
Bryce Lee
168d0ade0c am 1e53b98c: Merge "Allow press and hold from non-interactive." into lmp-mr1-modular-dev
* commit '1e53b98c38b6606859f4b33a98d776cbb65f1a42':
  Allow press and hold from non-interactive.
2015-03-09 15:35:05 +00:00
Nicolas Prevot
6dc6876eed Merge "Add a new extra to specify the admin component for provisioning." 2015-03-09 14:53:24 +00:00
Nicolas Prevot
1844025738 Add a new extra to specify the admin component for provisioning.
An app may have several device admins.
For this case, allow the caller to specify which one will become
an active device admin, and the profile owner (in the profile owner flow).

BUG:19348295
Change-Id: Ia5f995eed6c7f8933eb00d3250daa703ba6ee616
2015-03-09 14:48:04 +00:00
Geoff Mendal
ee34679510 Merge "Import translations. DO NOT MERGE" 2015-03-09 14:41:18 +00:00
Geoff Mendal
7dd69f551f Import translations. DO NOT MERGE
Change-Id: I9b6fac7639695f15cc7d1aa5b814bd6fa0872165
Auto-generated-cl: translation import
2015-03-09 07:39:13 -07:00
Geoff Mendal
8951e572de Merge "Import translations. DO NOT MERGE" 2015-03-09 13:55:21 +00:00
Geoff Mendal
cfad35db63 Import translations. DO NOT MERGE
Change-Id: I433509f59a78920d4e2ac1e5eb4d44fb81b2fd48
Auto-generated-cl: translation import
2015-03-09 06:40:26 -07:00
Geoff Mendal
cb93de1b7d Import translations. DO NOT MERGE
Change-Id: Id2e79810aa3f2c1beb932786f579feab06b6825a
Auto-generated-cl: translation import
2015-03-09 06:23:28 -07:00