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

161960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Wright
9570045713 am a33424a5: Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev 
* commit 'a33424a540ea725d4b513ee713931c66e62721a2':
  Add MEDIA_PROJECTION_SERVICE to the ServiceName list.
 2014-12-30 19:45:47 +00:00
Michael Wright
a33424a540 Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev 2014-12-30 19:40:52 +00:00
Marvin Paul
8298afbc78 Merge "Don\'t backup ringtone on non-telephony devices." into lmp-mr1-dev 
automerge: a30fdf7

* commit 'a30fdf790d66e241252c51d7dbdc401e021e51ad':
  Don't backup ringtone on non-telephony devices.
 2014-12-30 00:53:52 +00:00
Marvin Paul
a30fdf790d Merge "Don't backup ringtone on non-telephony devices." into lmp-mr1-dev 2014-12-29 23:18:17 +00:00
Andre Eisenbach
1d23da911a am d7d9cdae: Merge "Exclude unnecessary intents in SystemUI" into lmp-mr1-dev 
* commit 'd7d9cdaebb30df5564b5787ee02d4624673c8523':
  Exclude unnecessary intents in SystemUI
 2014-12-29 18:36:27 +00:00
Andre Eisenbach
d7d9cdaebb Merge "Exclude unnecessary intents in SystemUI" into lmp-mr1-dev 2014-12-29 18:32:22 +00:00
Svetoslav
72da9ed886 am e5ea48a7: Fix a race in accessibility manager. 
* commit 'e5ea48a7fe295a2815bab57f2e870901ce48b312':
  Fix a race in accessibility manager.
 2014-12-29 18:23:54 +00:00
Svetoslav
e5ea48a7fe Fix a race in accessibility manager. 
The accessibility manager has APIs for clients to observe changes
in accessibility, touch exploration, and high contrast states. The
notification of the listeners has to be done with no lock held but
in an attempt to do that the code was incorrectly iterating over
the copy on write collection.

bug:18840784

Change-Id: I6803ff1657fbf6b0cc7936671d5bbdebb5cbf6bb
 2014-12-29 09:40:46 -08:00
John Spurlock
db416907b8 am af84e073: Merge "Audio Policy: Clear calling identity for all paths setting ringer mode." into lmp-mr1-dev 
* commit 'af84e073bce12c6ae0c737339804e96314bb663d':
  Audio Policy: Clear calling identity for all paths setting ringer mode.
 2014-12-24 01:21:22 +00:00
John Spurlock
af84e073bc Merge "Audio Policy: Clear calling identity for all paths setting ringer mode." into lmp-mr1-dev 2014-12-24 01:16:14 +00:00
Michael Wright
446e019a06 Add MEDIA_PROJECTION_SERVICE to the ServiceName list. 
This prevents our lint tooling from complaining that we're passing
invalid values when trying to get the MediaProjectionManager.

Bug: 18830590
Change-Id: I34633248e895b0ac7f5083e18a7d2385ca6f8adb
 2014-12-23 17:01:49 -08:00
Marvin Paul
8fc5072524 Don't backup ringtone on non-telephony devices. 
Restoring a device that supports telephony using the backup set of
a non-telephony device would cause the ringtone to be set to "None"
instead of the default value. This was due to the fact that on
non-telephony devices, the ringtone value was being backed up as
"_silent" instead of null.

Bug: 18777629

Change-Id: Idece1f874438a895169dbba7df1d716adea6660e
 2014-12-23 14:58:17 -08:00
John Spurlock
af88a19165 Audio Policy: Clear calling identity for all paths setting ringer mode. 
For proper appops bookkeeping and zen setting changes.

Bug: 18832923
Change-Id: Ic029d3226458ca1a9229a0bc5726bedd5e117ad7
 2014-12-23 16:14:44 -05:00
Baligh Uddin
bedfb2faec am 45c6ae56: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '45c6ae56d969709e0969514fa219375561c2df38':
  Import translations. DO NOT MERGE
 2014-12-23 15:59:36 +00:00
Baligh Uddin
378939f058 am 4acca673: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '4acca673904d3f99a3686a9ad92f471e97e67959':
  Import translations. DO NOT MERGE
 2014-12-23 15:59:31 +00:00
Baligh Uddin
45c6ae56d9 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-23 15:53:44 +00:00
Baligh Uddin
c5d0323c12 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-23 15:53:32 +00:00
Baligh Uddin
4acca67390 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-23 15:52:54 +00:00
Baligh Uddin
b0e2d4c7f1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-23 15:52:49 +00:00
Robin Lee
c9db16c591 am b4b14e39: Merge "Revert "DevicePolicy: Don\'t warn about managed profile CAs"" into lmp-mr1-dev 
* commit 'b4b14e391dbcde537350ccf649b3603cafba1e6c':
  Revert "DevicePolicy: Don't warn about managed profile CAs"
 2014-12-23 13:29:05 +00:00
Robin Lee
b4b14e391d Merge "Revert "DevicePolicy: Don't warn about managed profile CAs"" into lmp-mr1-dev 2014-12-23 12:30:28 +00:00
Baligh Uddin
8dbf4f60e6 Import translations. DO NOT MERGE 
Change-Id: Ia6fc4bb7529db266834f9de0e809c77be53fa38b
Auto-generated-cl: translation import
 2014-12-23 00:37:22 -08:00
Baligh Uddin
3fa832bbfa Import translations. DO NOT MERGE 
Change-Id: I2096264002a0f4dad73672f5834327f151e95788
Auto-generated-cl: translation import
 2014-12-23 00:28:11 -08:00
Baligh Uddin
192c568072 Import translations. DO NOT MERGE 
Change-Id: I8e2bfc9d5db55c0a7aa2c0cc7d0318ed5df921c0
Auto-generated-cl: translation import
 2014-12-22 21:46:27 -08:00
Baligh Uddin
1cbf184edd Import translations. DO NOT MERGE 
Change-Id: Ic2b81358285cfa793cf31ddc621e86fadb7d218f
Auto-generated-cl: translation import
 2014-12-22 20:56:36 -08:00
Baligh Uddin
cecabf48ae am 83a590b1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '83a590b14ca70da7b6061529a521212572d732b3':
  Import translations. DO NOT MERGE
 2014-12-23 04:50:07 +00:00
Baligh Uddin
83a590b14c Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-23 04:44:58 +00:00
Baligh Uddin
f17490f5c2 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-23 04:44:53 +00:00
Baligh Uddin
0b85506360 Import translations. DO NOT MERGE 
Change-Id: Ie975c5e8d1edb7afc679ce1d27bb7e09b81df571
Auto-generated-cl: translation import
 2014-12-22 20:26:50 -08:00
Baligh Uddin
4136b4f7fe Import translations. DO NOT MERGE 
Change-Id: Ib629c0bca4f92a0c81bf5af904773df1b1f8549e
Auto-generated-cl: translation import
 2014-12-22 20:23:07 -08:00
Pavel Zhamaitsiak
48fd1688a2 am b45075a7: Merge "Add configuration indicating whether TTY over VoLTE is supported." into lmp-mr1-dev 
* commit 'b45075a7cb508e63ff2d662affbc970202249ac2':
  Add configuration indicating whether TTY over VoLTE is supported.
 2014-12-23 03:44:34 +00:00
Pavel Zhamaitsiak
b45075a7cb Merge "Add configuration indicating whether TTY over VoLTE is supported." into lmp-mr1-dev 2014-12-23 03:39:07 +00: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
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 80559f4aadb3419eecdf6bf61945af584cd2aa8a.

Bug: 18224038
Change-Id: I108a4e8cf185401fef4806e1ad8c2cc78992e843
 2014-12-22 13:22:11 +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