Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,037 Commits 3 Branches 0 Tags
813d974e33366aaeeb54e242e2767d4eeaf940dc
Commit Graph

177037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarah Maddox
029acc8ee8 am ab515931: Merge "docs: Fixes typo on Play services page for Maps." into lmp-docs 
* commit 'ab5159310ad68f4a4325d772dc7369f7368b5a5b':
  docs: Fixes typo on Play services page for Maps.
 2014-12-23 02:51:47 +00:00
Sarah Maddox
ab5159310a Merge "docs: Fixes typo on Play services page for Maps." into lmp-docs 2014-12-23 02:20:23 +00:00
Sarah Maddox
71de8ea11f docs: Fixes typo on Play services page for Maps. 
Bug: 18832605
Change-Id: I31cd802c80fe5f1c5b0c600859e9a32b020344e7
 2014-12-23 13:08:08 +11:00
Amit Mahajan
4f68c0c1d8 am d00b6067: Merge "IMS: add the api to get IMS registration information." into lmp-mr1-dev 
* commit 'd00b6067bf03b59143d98dba1343ced27306863c':
  IMS: add the api to get IMS registration information.
 2014-12-23 01:24:28 +00:00
Amit Mahajan
d00b6067bf Merge "IMS: add the api to get IMS registration information." into lmp-mr1-dev 2014-12-23 01:19:21 +00:00
Andreas Gampe
08b2d585b1 Core/jni: Remove Dalvik options from AndroidRuntime 
Dalvik is dead. Remove old command-line options from AndroidRuntime.

Bug: 18833580
Bug: 18834205
Change-Id: If9a6f78cc0d74fc7a596b08065059b388a8d4b2f
 2014-12-22 14:57:18 -08:00
Jinsuk Kim
266f2b047e am 92ae5abf: Merge "CEC: Let the caller check CEC device type" into lmp-mr1-dev 
* commit '92ae5abf4dac470c5c915ec4782d5af6f251d257':
  CEC: Let the caller check CEC device type
 2014-12-22 22:53:58 +00:00
Etan Cohen
0ee7485169 Add configuration indicating whether TTY over VoLTE is supported. 
Bug: 18593974
Change-Id: I8b45bfe91a7222d96f22a93e5bc887b96c231afe
 2014-12-22 22:50:42 +00:00
Jinsuk Kim
92ae5abf4d Merge "CEC: Let the caller check CEC device type" into lmp-mr1-dev 2014-12-22 22:48:45 +00:00
Jinsuk Kim
98d760e1c3 CEC: Let the caller check CEC device type 
Device event listener mechanism invoke the callback on all kinds
of devices in order to deal with a caller who wants to get notified
for all types. TIF was changed to check the device type to make
sure it handles source type only.

Bug: 18832462
Change-Id: I5123fe79c09f623849b93b64d0c28e6a930dd437
 2014-12-23 07:39:11 +09:00
Robert Greenwalt
33868dab9a am 4dcacef5: Merge "Fix timing between bcast and net setup." into lmp-mr1-dev 
* commit '4dcacef5c53e9d94beab777d79ecada86a15289b':
  Fix timing between bcast and net setup.
 2014-12-22 22:36:11 +00:00
Robert Greenwalt
4dcacef5c5 Merge "Fix timing between bcast and net setup." into lmp-mr1-dev 2014-12-22 22:32:41 +00:00
John Spurlock
de9af5cdc0 am 17ca1aaf: Merge "Zen: Fix selection logic for "Indefinitely"." into lmp-mr1-dev 
* commit '17ca1aaf72ac5d48d33517331b6d772c1a158bfd':
  Zen: Fix selection logic for "Indefinitely".
 2014-12-22 22:01:27 +00:00
John Spurlock
17ca1aaf72 Merge "Zen: Fix selection logic for "Indefinitely"." into lmp-mr1-dev 2014-12-22 21:56:37 +00:00
John Spurlock
0b68850375 Zen: Fix selection logic for "Indefinitely". 
Use a signal condition value for the forever condition in the panel
to ease the distinction between no selection + selecting indef.

Bug: 18810529
Change-Id: I2590899ab43734708c72aad066653ef27f89d760
 2014-12-22 15:13:30 -05:00
Libin.Tang@motorola.com
0303be4a8a IMS: add the api to get IMS registration information. 
Bug: 18668325
Change-Id: Ie694c7f1cc12a573cbef2815199ae6c91cf8088e
 2014-12-22 19:35:18 +00:00
Jean-Michel Trivi
98ba840987 am 996af72b: Merge "AudioRecord: filter attributes" into lmp-mr1-dev 
* commit '996af72b0c2c161e66cee00560e5ba00459f39bf':
  AudioRecord: filter attributes
 2014-12-22 19:00:22 +00:00
Jean-Michel Trivi
996af72b0c Merge "AudioRecord: filter attributes" into lmp-mr1-dev 2014-12-22 18:55:40 +00:00
Jean-Michel Trivi
43bcd8fa74 AudioRecord: filter attributes 
When creating an AudioRecord instance, filter the tags in the
  AudioAttributes to remove tags that are handled at the Java
  layer.

Bug: 18733215
Bug: 18736417

Change-Id: I16a3497742086deced4e8677bd6231290396c5f6
 2014-12-22 18:15:32 +00:00
Robin Lee
853964927c Revert "DevicePolicy: Don't warn about managed profile CAs" 
This reverts commit 80559f4aad.

Bug: 18224038
Change-Id: I108a4e8cf185401fef4806e1ad8c2cc78992e843
 2014-12-22 13:22:11 +00:00
Joe Fernandez
69434df395 am 180bd6be: am 76db15a8: docs: fix problem with TOC after Japanese pages merge 
* commit '180bd6be5214a57283387cc3935e14742dc6f08b':
  docs: fix problem with TOC after Japanese pages merge
 2014-12-20 07:02:29 +00:00
Joe Fernandez
180bd6be52 am 76db15a8: docs: fix problem with TOC after Japanese pages merge 
* commit '76db15a8c9a644bdff854763a922e1e3fd525e9c':
  docs: fix problem with TOC after Japanese pages merge
 2014-12-20 06:49:19 +00:00
Joe Fernandez
76db15a8c9 docs: fix problem with TOC after Japanese pages merge 
Change-Id: I75c78bd600907467fa81af197df216d5e6a31b1f
 2014-12-19 22:38:47 -08:00
David Friedman
2d179c899a am 919ecb22: am 58a5e3db: Merge "Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e" into lmp-docs 
* commit '919ecb221f2132f4d907a2e37cf021e17538762d':
  Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
 2014-12-20 03:05:16 +00:00
David Friedman
919ecb221f am 58a5e3db: Merge "Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e" into lmp-docs 
* commit '58a5e3db000c6fe42e68790e72418bf143e3bc14':
  Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
 2014-12-20 02:48:00 +00:00
David Friedman
58a5e3db00 Merge "Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e" into lmp-docs 2014-12-20 02:04:39 +00:00
David Friedman
827cc88a33 Android TV initial (time-sensitive) localization release for Japanese partners. 
Bug: 18527238
Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
 2014-12-19 18:00:44 -08:00
Joe Fernandez
214e6867c5 am c27d5fd6: am 7cec35ef: Merge "docs: b/18122848 [DAC] Android TV - Recommendation card" into lmp-docs 
* commit 'c27d5fd6a88b37226c02e67d6c86c75da47d5d9d':
  docs: b/18122848 [DAC] Android TV - Recommendation card
 2014-12-20 00:40:59 +00:00
Chet Haase
2167b11de6 Fix selector bug 
Issue #18784539 Row stays highlighted if I begin scrolling after the rows been highlighted in "About phone"

Change-Id: Ia91467d8fe64eec077f20af70eae0d5bb070c255
 2014-12-19 16:37:18 -08:00
Joe Fernandez
c27d5fd6a8 am 7cec35ef: Merge "docs: b/18122848 [DAC] Android TV - Recommendation card" into lmp-docs 
* commit '7cec35ef5225f3dbc11cd78b96478751fe4158c3':
  docs: b/18122848 [DAC] Android TV - Recommendation card
 2014-12-20 00:34:38 +00:00
Joe Fernandez
7cec35ef52 Merge "docs: b/18122848 [DAC] Android TV - Recommendation card" into lmp-docs 2014-12-20 00:30:09 +00:00
Joe Fernandez
001f6f5451 am 66fefd0c: am a9a36ab2: Merge "docs: plugin link name update" into lmp-docs 
* commit '66fefd0c4c91f29826be8c3e47f4ae2982468b19':
  docs: plugin link name update
 2014-12-20 00:23:30 +00:00
Scott Rowe
13d31b0a40 am d7d1411a: am e2b44f86: docs: Making TV Apps Searchable - new training 
* commit 'd7d1411aa04c834dfe65cb16e79c495a7d47dba0':
  docs: Making TV Apps Searchable - new training
 2014-12-20 00:23:25 +00:00
Joe Fernandez
66fefd0c4c am a9a36ab2: Merge "docs: plugin link name update" into lmp-docs 
* commit 'a9a36ab225f8e53d79d83ff9eb452efc4933b6ae':
  docs: plugin link name update
 2014-12-20 00:18:07 +00:00
Scott Rowe
d7d1411aa0 am e2b44f86: docs: Making TV Apps Searchable - new training 
* commit 'e2b44f86b9ff32cc5fec04c10d09d639fd1f45f2':
  docs: Making TV Apps Searchable - new training
 2014-12-20 00:18:03 +00:00
Joe Fernandez
a9a36ab225 Merge "docs: plugin link name update" into lmp-docs 2014-12-20 00:13:58 +00:00
Scott Rowe
ea7a71b25d docs: b/18122848 [DAC] Android TV - Recommendation card 
Change-Id: I3347254ae659e4edc7a07aa30b276bd24636db17
 2014-12-19 16:11:58 -08:00
Jinsuk Kim
f6ec9f5363 am ed27b72e: Merge "CEC: Allow no vendor-specific data for <Vendor Command With ID>" into lmp-mr1-dev automerge: 2c8c47d 
* commit 'ed27b72e581aea85d3c9db4284b07c560d326838':
  CEC: Allow no vendor-specific data for <Vendor Command With ID>
 2014-12-20 00:06:25 +00:00
Jinsuk Kim
ed27b72e58 Merge "CEC: Allow no vendor-specific data for <Vendor Command With ID>" into lmp-mr1-dev 
automerge: 2c8c47d

* commit '2c8c47daefc881c5603689be39b10cb93a0cabdf':
  CEC: Allow no vendor-specific data for <Vendor Command With ID>
 2014-12-20 00:00:38 +00:00
Jinsuk Kim
2c8c47daef Merge "CEC: Allow no vendor-specific data for <Vendor Command With ID>" into lmp-mr1-dev 2014-12-19 23:58:12 +00:00
Jinsuk Kim
a95794bc4f CEC: Allow no vendor-specific data for <Vendor Command With ID> 
Changed not to return <Feature Abort> if the command comes
with any vendor-specific data, which is still valid.

Bug: 18816046

Change-Id: I22204d167c7783a841f7bb560e900b525f9f036b
 2014-12-20 08:47:34 +09:00
Eric Laurent
6d1cb48da4 am a1bd2d00: am 1ed9a88e: Merge "MediaSession: unmute stream when adjusting volume" into lmp-mr1-dev 
* commit 'a1bd2d0008e5d9cb563936b7f044d8796c37fb2f':
  MediaSession: unmute stream when adjusting volume
 2014-12-19 23:27:25 +00:00
John Reck
ed3c2962be am 165fb8f5: am f89dac47: Merge "Tweak RT-animator scheduling" into lmp-mr1-dev 
* commit '165fb8f5aa0709a8dc35f99a9b81f6906452a648':
  Tweak RT-animator scheduling
 2014-12-19 23:21:44 +00:00
Eric Laurent
a1bd2d0008 am 1ed9a88e: Merge "MediaSession: unmute stream when adjusting volume" into lmp-mr1-dev 
* commit '1ed9a88ec3a1a1d9f418ae0b6f1e77e7b7dd99a3':
  MediaSession: unmute stream when adjusting volume
 2014-12-19 23:21:04 +00:00
Eric Laurent
1ed9a88ec3 Merge "MediaSession: unmute stream when adjusting volume" into lmp-mr1-dev 2014-12-19 23:17:08 +00:00
John Reck
165fb8f5aa am f89dac47: Merge "Tweak RT-animator scheduling" into lmp-mr1-dev 
* commit 'f89dac472366c547e535dfafa8df25bd2d031833':
  Tweak RT-animator scheduling
 2014-12-19 23:15:12 +00:00
Scott Rowe
e2b44f86b9 docs: Making TV Apps Searchable - new training 
Change-Id: I188c14789c9ba36a35d0c2d07b349ac301837a48
 2014-12-19 15:15:04 -08:00
John Reck
f89dac4723 Merge "Tweak RT-animator scheduling" into lmp-mr1-dev 2014-12-19 23:09:49 +00:00
Svet Ganov
19ecc7847f am f64d26fc: am e130d6c1: Merge "Remove a bad heuristic when determining click location for accessibility." into lmp-mr1-dev 
* commit 'f64d26fce002019f390b4f9f37c8edf965c362c5':
  Remove a bad heuristic when determining click location for accessibility.
 2014-12-19 22:43:30 +00:00
Svet Ganov
f64d26fce0 am e130d6c1: Merge "Remove a bad heuristic when determining click location for accessibility." into lmp-mr1-dev 
* commit 'e130d6c14ae2d4a6f703ef452a7e5741d84936a0':
  Remove a bad heuristic when determining click location for accessibility.
 2014-12-19 22:36:56 +00:00