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

178989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
be0cca472b Import translations. DO NOT MERGE 
Change-Id: Ie3c6d7239fc0f85e1703332c816edf8b19d9fa5d
Auto-generated-cl: translation import
 2014-12-23 00:46:49 -08:00
Baligh Uddin
0dbb961e8f Import translations. DO NOT MERGE 
Change-Id: Idf18f4ddf1f44a5618c1087b722eca4847b137a2
Auto-generated-cl: translation import
 2014-12-23 00:44:58 -08: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
Sungsoo Lim
898de6fd8c Implement cloneTvInputEvent 
memcpy() only copies the memory address value of device_info.audio_address,
and it could be invalid when onDeviceAvailable() is called.

Bug: 18819334
Change-Id: I827da8032a982abf3029874b8454ca79290bb0e0
 2014-12-23 17:34:00 +09: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
43b6ce7622 Import translations. DO NOT MERGE 
Change-Id: I1506acd4f2df7bda4a8d4fb968b5e9e316326ec6
Auto-generated-cl: translation import
 2014-12-23 00:23:42 -08:00
Baligh Uddin
f12a977282 Import translations. DO NOT MERGE 
Change-Id: Ib6e2182c8ba3a405612b9345614ad535adbac7fd
Auto-generated-cl: translation import
 2014-12-23 00:12:38 -08:00
Baligh Uddin
a88ec29686 Import translations. DO NOT MERGE 
Change-Id: Ib8a2992780a3a20748d2d150e1f887674677cf64
Auto-generated-cl: translation import
 2014-12-23 00:09:22 -08:00
Baligh Uddin
3d2f0f40d2 Import translations. DO NOT MERGE 
Change-Id: I0df2423ec6f0d689fb1b9510dcf3d13ba420f7cd
Auto-generated-cl: translation import
 2014-12-23 00:07:33 -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
e876dbcaaa Merge "Import translations. DO NOT MERGE" 2014-12-23 04:45:08 +00:00
Baligh Uddin
6f0e661704 Merge "Import translations. DO NOT MERGE" 2014-12-23 04:45:00 +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
97405d6160 Merge "Import translations. DO NOT MERGE" 2014-12-23 04:44:51 +00:00
Baligh Uddin
1b09b23b74 Import translations. DO NOT MERGE 
Change-Id: I9535f01cf967b5a17dfad63ef52d1b6bec03d322
Auto-generated-cl: translation import
 2014-12-22 20:31:46 -08: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
Baligh Uddin
2d9543abca Import translations. DO NOT MERGE 
Change-Id: I502afa35fad7c98a1a6728b88706245891296c18
Auto-generated-cl: translation import
 2014-12-22 20:19:30 -08:00
Baligh Uddin
46b75cf7df Import translations. DO NOT MERGE 
Change-Id: I6951b81085c270c7539e19a6524b8950e86cbabc
Auto-generated-cl: translation import
 2014-12-22 20:15:52 -08:00
Andreas Gampe
1daa2c4598 am 5470c169: am 2b20efa7: Merge "Core/jni: Remove Dalvik options from AndroidRuntime" 
automerge: 83cfb97

* commit '83cfb97323469e3370840c6cefb5689ab2059025':
  Core/jni: Remove Dalvik options from AndroidRuntime
 2014-12-23 03:46:26 +00: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
Andreas Gampe
83cfb97323 am 5470c169: am 2b20efa7: Merge "Core/jni: Remove Dalvik options from AndroidRuntime" 
* commit '5470c1699121135f0f1c615d080359f0bc9cf1c4':
  Core/jni: Remove Dalvik options from AndroidRuntime
 2014-12-23 03:44:12 +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
Andreas Gampe
5470c16991 am 2b20efa7: Merge "Core/jni: Remove Dalvik options from AndroidRuntime" 
* commit '2b20efa728f79ef9322930aefbbf0483a578ee74':
  Core/jni: Remove Dalvik options from AndroidRuntime
 2014-12-23 03:37:07 +00:00
Andreas Gampe
2b20efa728 Merge "Core/jni: Remove Dalvik options from AndroidRuntime" 2014-12-23 03:29:46 +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
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
Chris Craik
e84a208317 Add overrides and switch to nullptr keyword 
Changes generated with clang-modernize.

Additionally, fixed some struct-vs-class usage to make clang happy.

Change-Id: Ic6ef2427401ff1e794d26f21f7b44868fc75fb72
 2014-12-22 14:56:08 -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
Chris Craik
07adacf499 Cleanup 
Change-Id: I91ffb9c66697741116fdeaa31abdf6cfd79155df
 2014-12-22 11:20:57 -08: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
32328b5cec am ed27b72e: Merge "CEC: Allow no vendor-specific data for <Vendor Command With ID>" into lmp-mr1-dev automerge: 2c8c47d 
automerge: f6ec9f5

* commit 'f6ec9f53639719b6d9ac981a2b9fb67716c00fc6':
  CEC: Allow no vendor-specific data for <Vendor Command With ID>
 2014-12-20 00:07:49 +00: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