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

150822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Naveen Kalla
74eedc2a72 am 30e6a232: Invoke shutdownMobileRadios Telephony APIs from ShutdownThread 
* commit '30e6a232769fba0cc08a5e783582858c4b4add0d':
  Invoke shutdownMobileRadios Telephony APIs from ShutdownThread
 2014-08-21 15:12:09 +00:00
Esteban Talavera
ae4af39504 am a2cdeadd: Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev 
* commit 'a2cdeadd322a1d2cb0778fa44eee61fcd0aa1e41':
  Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC
 2014-08-21 15:12:05 +00:00
Naveen Kalla
bd7723637b Invoke shutdownMobileRadios Telephony APIs from ShutdownThread 
shutdownMobileRadios API shuts down multiple Radios on MSIM devices and
also gracefully shuts down Radios and SIM cards on single SIM and
MSIM devices. Use this API instead of the old setRadio APIs.

Add RIL_REQUEST_SHUTDOWN to RILConstants. Message is sent to notify
RIL that the device is shutting down.

Bug: 9773278
Change-Id: I6afa9e810cefc7855f7ae42e51f39cc51fa2aa6e
 2014-08-21 15:08:22 +00:00
Esteban Talavera
a5a69a3f89 am 5f9653ce: Merge "Rename get/setBlockUninstall() to get/setUninstallBlocked()" into lmp-dev 
* commit '5f9653cec90ad88d94ee5c31b5de6010c4fb97a1':
  Rename get/setBlockUninstall() to get/setUninstallBlocked()
 2014-08-21 15:02:32 +00:00
vandwalle
a37f2592dd am 23e25851: Merge "per bssid blacklist" into lmp-dev 
* commit '23e258519b3c6e479bd748ce7bab624ca1ab088c':
  per bssid blacklist
 2014-08-21 15:02:28 +00:00
Esteban Talavera
2df7d1ef51 Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev 2014-08-21 14:58:18 +00:00
Esteban Talavera
20303426ac Merge "Rename get/setBlockUninstall() to get/setUninstallBlocked()" into lmp-dev 2014-08-21 14:58:07 +00:00
vandwalle
beec21522d Merge "per bssid blacklist" into lmp-dev 2014-08-21 14:55:12 +00:00
John Reck
e4d7d34761 am 872c7679: am d6a934a9: Merge "Run RevealAnimator on RT" into lmp-dev 
* commit '872c7679bc5461d2fdb26ffeb091b88bc912b77b':
  Run RevealAnimator on RT
 2014-08-21 14:34:18 +00:00
Esteban Talavera
8cce064f1b am 50a84946: am 58dada0d: Merge "Remove setApplicationsHidden" into lmp-dev 
* commit '50a84946336e747378ea8f09ff1bf3d6fb457ebe':
  Remove setApplicationsHidden
 2014-08-21 14:34:13 +00:00
Esteban Talavera
d5c5c13c85 Rename get/setBlockUninstall() to get/setUninstallBlocked() 
As requested in the API review

Bug: 17005622
Change-Id: I1332ad11e588ab3fa409f2a28222608936cb383e
 2014-08-21 15:30:13 +01:00
John Reck
d5f826b4c1 am d6a934a9: Merge "Run RevealAnimator on RT" into lmp-dev 
* commit 'd6a934a9a86a293428ccff8b78eba42825dd09f8':
  Run RevealAnimator on RT
 2014-08-21 14:29:25 +00:00
Esteban Talavera
ed8cf270ae am 58dada0d: Merge "Remove setApplicationsHidden" into lmp-dev 
* commit '58dada0df65027cad970351b981f526e80052aef':
  Remove setApplicationsHidden
 2014-08-21 14:25:07 +00:00
Jason Monk
87f687830d am d96d3340: am c93cf56b: Merge "Update VPN Icon to key." into lmp-dev 
* commit 'd96d334012d7c2098730836e1e33d0fb0710e68c':
  Update VPN Icon to key.
 2014-08-21 14:24:52 +00:00
Jason Monk
ce6e75bb43 am ee986895: am e34fef3b: Don\'t stack toasts for every user press 
* commit 'ee9868955b11f44c37970fa9309928d11d199ec2':
  Don't stack toasts for every user press
 2014-08-21 14:24:48 +00:00
John Reck
94f6878bbd Merge "Run RevealAnimator on RT" into lmp-dev 2014-08-21 14:23:29 +00:00
Esteban Talavera
8c5c373647 Merge "Remove setApplicationsHidden" into lmp-dev 2014-08-21 14:17:25 +00:00
Jason Monk
bd0cd6fe30 am c93cf56b: Merge "Update VPN Icon to key." into lmp-dev 
* commit 'c93cf56b7852120fc32d6e742a91a49efc9f5499':
  Update VPN Icon to key.
 2014-08-21 14:15:09 +00:00
Jason Monk
d0be70b407 am e34fef3b: Don\'t stack toasts for every user press 
* commit 'e34fef3b40889f30891fe12ff441edaa48544a7f':
  Don't stack toasts for every user press
 2014-08-21 14:15:03 +00:00
Jason Monk
e8847bd831 Merge "Update VPN Icon to key." into lmp-dev 2014-08-21 14:06:53 +00:00
Esteban Talavera
d469a0b9ce Set last phrase for constant values of EXTRA_* fields to ALL_CAPS 
As requested in the API review.

Bug: 17005622,16486199
Change-Id: I6f60a43fe23526cfe855d81015feb759cf643926
 2014-08-21 14:58:14 +01:00
Jason Monk
07f82b7942 Don't stack toasts for every user press 
Showing a toast on every press was adding up to a long list of
toasts to clear out of the display, now cancel the last so we
don't have that problem.

Also fix unlock strings to not use insertions because of problems
translating the context.

Bug: 16892731
Bug: 16366701
Change-Id: Ia523469089c9f8dd1f3e466a9d4ea901a376d1bc
 2014-08-21 09:42:42 -04:00
Esteban Talavera
1aee98fbf3 Updated documentation for setScreenCaptureDisabled() 
As requested in the API review. Also, removed unused import.

Bug: 17005622
Change-Id: I0bc57411ec34119f64e28eaf27c32a67b45fd66f
 2014-08-21 14:03:55 +01:00
Ji-Hwan Lee
4de7005843 am ed360234: am 155bf68b: TIF: Release main TvView on reset() 
* commit 'ed3602348060ea049c159a87a6058c086021b804':
  TIF: Release main TvView on reset()
 2014-08-21 12:26:24 +00:00
Adrian Roos
e2ed541a7d am 3ee83961: am 4f933f8b: Merge "Fix broken brightness mirror" into lmp-dev 
* commit '3ee839611275b5107512f3b8e457534e7990c2fb':
  Fix broken brightness mirror
 2014-08-21 12:17:09 +00:00
Ji-Hwan Lee
7eb1a44dba am 155bf68b: TIF: Release main TvView on reset() 
* commit '155bf68b24989edd4600cb018e2f9efd4f75fd6f':
  TIF: Release main TvView on reset()
 2014-08-21 12:16:59 +00:00
Ji-Hwan Lee
c7f440dcd8 TIF: Release main TvView on reset() 
Also, use WeakReference for TvView.sMainTvView.

Change-Id: I6eec1c9f907692f0fbfa96d80c7d1141eabde6e2
 2014-08-21 12:11:50 +00:00
Adrian Roos
3243c10402 am 4f933f8b: Merge "Fix broken brightness mirror" into lmp-dev 
* commit '4f933f8b0b0a28bd225042d4fb7b55ab19c81319':
  Fix broken brightness mirror
 2014-08-21 12:08:25 +00:00
Adrian Roos
0e7d37656f Merge "Fix broken brightness mirror" into lmp-dev 2014-08-21 11:58:44 +00:00
Adrian Roos
73cec7e823 Fix broken brightness mirror 
Bug: 17136823
Change-Id: I5609b2d539db56ec235899c069a080c8a959d254
 2014-08-21 13:57:48 +02:00
Niels Egberts
8f4c0ef2ce am 3709bca8: am 14e9dc50: Merge "Fixed spelling of android.nominative and updated some comments." into lmp-dev 
* commit '3709bca86d7a24173f87e476fd2032ef303a766a':
  Fixed spelling of android.nominative and updated some comments.
 2014-08-21 11:49:42 +00:00
Niels Egberts
dff817bf45 am 14e9dc50: Merge "Fixed spelling of android.nominative and updated some comments." into lmp-dev 
* commit '14e9dc50e3a787c926e3d56e854945fc96b5d500':
  Fixed spelling of android.nominative and updated some comments.
 2014-08-21 11:39:49 +00:00
Niels Egberts
5e5ee9945b Merge "Fixed spelling of android.nominative and updated some comments." into lmp-dev 2014-08-21 11:33:01 +00:00
Kenny Guy
8bcbf01533 am 48e5eb54: am 977c20b6: Merge "Add apis for whitelisting IMEs and accessibility services." into lmp-dev 
* commit '48e5eb54e27c363f63c0b41597d2a7f0cb2d0da2':
  Add apis for whitelisting IMEs and accessibility services.
 2014-08-21 11:11:51 +00:00
Kenny Guy
3f9ed38ed0 am 977c20b6: Merge "Add apis for whitelisting IMEs and accessibility services." into lmp-dev 
* commit '977c20b6907cf3499d18a0208fcddb14dc8bcc3a':
  Add apis for whitelisting IMEs and accessibility services.
 2014-08-21 11:02:13 +00:00
Kenny Guy
b9e468cb9d Merge "Add apis for whitelisting IMEs and accessibility services." into lmp-dev 2014-08-21 10:54:26 +00:00
Jessica Hummel
1bcb4475cf am 562daf5c: am 8d8d2419: Merge "Strings: replace work space by work profile" into lmp-dev 
* commit '562daf5c6e22a9a8b9340522bcebf738092347d5':
  Strings: replace work space by work profile
 2014-08-21 10:29:21 +00:00
Niels Egberts
b9f7692ce6 Fixed spelling of android.nominative and updated some comments. 
Bug: 17000831
Change-Id: I3a87635a6a894ee8ad1386cde8b59dcd9533b23f
 2014-08-21 11:28:29 +01:00
Jessica Hummel
e14410f8c3 am 8d8d2419: Merge "Strings: replace work space by work profile" into lmp-dev 
* commit '8d8d2419103aeedb6210a7bec644778285e18ee8':
  Strings: replace work space by work profile
 2014-08-21 10:20:08 +00:00
Jessica Hummel
671be93cbb Merge "Strings: replace work space by work profile" into lmp-dev 2014-08-21 10:08:57 +00:00
Jessica Hummel
98c406c3cd Strings: replace work space by work profile 
Change-Id: I3f2dd5f628a34e1df351b3f1a526f3d2beea3ece
bug:16468412
 2014-08-21 11:05:50 +01:00
Esteban Talavera
115cd65d2a Remove setApplicationsHidden 
As requested in the API review. This version (the one that takes an Intent) was used only in the DeviceAdminSample and some CTS tests.

Bug: 17005622
Change-Id: I9984b22836417ad4d025302f61bd91704e9345a4
 2014-08-21 10:29:38 +01:00
Jinsuk Kim
22df1c14c3 am c65e637d: am 2e84b632: Merge "CEC: Fix a bug not sending <Set Stream Path>" into lmp-dev 
* commit 'c65e637d0e7a2dd0e2f3e01e3c9471153d36e52b':
  CEC: Fix a bug not sending <Set Stream Path>
 2014-08-21 06:10:20 +00:00
Jinsuk Kim
0beb87811f am 2e84b632: Merge "CEC: Fix a bug not sending <Set Stream Path>" into lmp-dev 
* commit '2e84b6327b87481fbf1b7ad769361c10e50a1028':
  CEC: Fix a bug not sending <Set Stream Path>
 2014-08-21 06:01:48 +00:00
Jinsuk Kim
f860be88a9 Merge "CEC: Fix a bug not sending <Set Stream Path>" into lmp-dev 2014-08-21 05:53:51 +00:00
Jinsuk Kim
4c80b835cd am 6c68b9fd: am b614b10f: Merge "CEC: Invoke input change for RAP request from MHL device" into lmp-dev 
* commit '6c68b9fdcbadf28f260ec73b0b1e39b2ad901efe':
  CEC: Invoke input change for RAP request from MHL device
 2014-08-21 05:42:26 +00:00
Jinsuk Kim
0eeec5a3a7 am b614b10f: Merge "CEC: Invoke input change for RAP request from MHL device" into lmp-dev 
* commit 'b614b10f7c4b2015ba55c5cb601e9067c6b47398':
  CEC: Invoke input change for RAP request from MHL device
 2014-08-21 05:33:02 +00:00
Jinsuk Kim
2626958c4b CEC: Fix a bug not sending <Set Stream Path> 
Passes the right flag to manual routing switching method for TV
to send out <Set Stream Path> to the newly selected device(path).

Bug: 17169555
Change-Id: I4a14925e366a433f36b28170e37d041053c0060d
 2014-08-21 14:31:40 +09:00
Jinsuk Kim
6800cddd6f Merge "CEC: Invoke input change for RAP request from MHL device" into lmp-dev 2014-08-21 05:26:19 +00:00
Zhijun He
9e4e439a68 Camera2: update aberration correction related tag name 
This is for API review update.

Bug: 17008587
Change-Id: I67c2cffed8fcc106008b0fde6f01cd81f4ce6db0
 2014-08-20 22:08:52 -07:00