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

148393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
e5d7411744 am c1da9cbf: am 2c374e64: am 82957e38: Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs 
* commit 'c1da9cbff5d5b597fd58cbb578a1eadc6f479c80':
  docs: Fixed typo in intents page. Bug: 16949177
 2014-08-21 17:44:53 +00:00
Rich Slogar
a0256562c8 am e415ebc6: am d309de3d: am 7bf7b779: Merge "Docs: Fixed typo \'Fore\'" into klp-modular-docs 
* commit 'e415ebc634c98b5a6aaa42c0698b7482e44b3b3f':
  Docs: Fixed typo 'Fore'
 2014-08-21 17:44:47 +00:00
Ricardo Cervera
866ae385dd am e4be8986: am 0d65bf25: am 262b4147: Merge "docs: Fixed bug in declaring layout page. Bug: 16815916" into klp-modular-docs 
* commit 'e4be8986544a45a2560003f004b72528c691acef':
  docs: Fixed bug in declaring layout page. Bug: 16815916
 2014-08-21 17:44:40 +00:00
Ricardo Cervera
005d4ecaaf am 9e6b3e7d: am 63da186f: am c5807808: docs: Fixed typo in Wear training class. Bug: 16709202 
* commit '9e6b3e7dd85224c836e902551079c2445688d762':
  docs: Fixed typo in Wear training class. Bug: 16709202
 2014-08-21 17:44:27 +00:00
Jeff Sharkey
a0b805715a Merge "Clear identity before calling out to PackageHelper" into lmp-dev 2014-08-21 17:42:02 +00:00
Robin Lee
e812d90969 Clear identity before calling out to PackageHelper 
PackageHelper.resolveInstallLocation expects the binding user to be
equivalent to the calling user. If this is not the case, it may fail
and throw an exception preventing anyone but user 0 from installing
anything.

Bug: 17175251
Change-Id: Id5615738c7b4e1234a548c7b4a410282d14c9ee3
 2014-08-21 17:37:20 +00:00
Adam Lesinski
223ddaa74d Merge "AAPT: Fix regression generating dynamic ref table for shared libraries" into lmp-dev 2014-08-21 17:31:46 +00:00
Ricardo Cervera
c1da9cbff5 am 2c374e64: am 82957e38: Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs 
* commit '2c374e643d6cce73a71fb57559f898b6b554e36c':
  docs: Fixed typo in intents page. Bug: 16949177
 2014-08-21 17:31:31 +00:00
Rich Slogar
e415ebc634 am d309de3d: am 7bf7b779: Merge "Docs: Fixed typo \'Fore\'" into klp-modular-docs 
* commit 'd309de3d06817e51aab056284874f613238ff400':
  Docs: Fixed typo 'Fore'
 2014-08-21 17:31:27 +00:00
Ricardo Cervera
e4be898654 am 0d65bf25: am 262b4147: Merge "docs: Fixed bug in declaring layout page. Bug: 16815916" into klp-modular-docs 
* commit '0d65bf25c8a9091d598f50e0d534625107db6cf6':
  docs: Fixed bug in declaring layout page. Bug: 16815916
 2014-08-21 17:31:03 +00:00
Ricardo Cervera
9e6b3e7dd8 am 63da186f: am c5807808: docs: Fixed typo in Wear training class. Bug: 16709202 
* commit '63da186fef8add43bcd0c347eec86946b67350c3':
  docs: Fixed typo in Wear training class. Bug: 16709202
 2014-08-21 17:30:57 +00:00
Winson Chung
b91bd653c9 Merge "Fixing issue with inconsistent icon filename. (Bug 16992882)" into lmp-dev 2014-08-21 17:19:28 +00:00
Andres Morales
6a12e77194 Merge "Remove old NFC unlock api" into lmp-dev 2014-08-21 17:07:32 +00:00
Paul Jensen
e16a24559f Merge "Send captive portal broadcast as user CURRENT." into lmp-dev 2014-08-21 17:05:42 +00:00
RoboErik
69b131339b Merge "Set transport control flags when a session is created" into lmp-dev 2014-08-21 16:58:42 +00:00
Dianne Hackborn
198d928615 Merge "Fix issue #17038762: Add API to add entries to the recents list" into lmp-dev 2014-08-21 16:56:18 +00:00
Chris Craik
c56a1a51a9 Merge "Clarify text shadow attribute/method comments" into lmp-dev 2014-08-21 16:46:53 +00:00
Nicolas Prevot
01e6a6fef1 Merge "Marking the methods to get Profile/Device Owner with @SystemApi." into lmp-dev 2014-08-21 16:33:47 +00:00
Paul Lawrence
7bf41929f2 Merge "Save PatternVisible setting to crypto header" into lmp-dev 2014-08-21 16:25:56 +00:00
Nicolas Prevot
465acf3f3f Marking the methods to get Profile/Device Owner with @SystemApi. 
BUG: 16860239

Change-Id: I60126a8112a57e836cae3bcd9b62ebf50385f5ec
 2014-08-21 17:22:28 +01:00
Zhijun He
eee850d355 Merge "Camera2: update aberration correction related tag name" into lmp-dev 2014-08-21 16:17:52 +00:00
Jaewan Kim
edaece1f30 Merge "TIF: Accept any character for custom label." into lmp-dev 2014-08-21 16:13:25 +00:00
Lorenzo Colitti
a945c35273 Merge "Fix findConnectionTypeForIface." into lmp-dev 2014-08-21 16:08:11 +00:00
Jaewan Kim
f0e530e4eb TIF: Accept any character for custom label. 
Bug: 16874696
Change-Id: Idc42853ea7f4b12a2eda1f45319bc31ee1a8c6b7
 2014-08-22 01:05:40 +09:00
Wenchao Tong
ddd0986311 Merge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-dev 2014-08-21 16:05:00 +00:00
Behdad Esfahbod
9f6ba7af56 Merge "Throw exception on nonexistent font" into lmp-dev 2014-08-21 16:01:54 +00:00
Kenny Guy
7a13ea7e3b Merge "Replicate text and sounds settings for managed profile." into lmp-dev 2014-08-21 15:55:43 +00:00
Esteban Talavera
e4be1bf2be Merge "Set last phrase for constant values of EXTRA_* fields to ALL_CAPS" into lmp-dev 2014-08-21 15:33:20 +00:00
Ricardo Cervera
2c374e643d am 82957e38: Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs 
* commit '82957e38b2d38ea41fdf930d722157287eab0590':
  docs: Fixed typo in intents page. Bug: 16949177
 2014-08-21 15:31:34 +00:00
Ricardo Cervera
82957e38b2 Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs 2014-08-21 15:22:11 +00:00
Esteban Talavera
5cef4fa9c1 Merge "Updated documentation for setScreenCaptureDisabled()" into lmp-dev 2014-08-21 15:21:59 +00:00
Jorim Jaggi
922fb7a7db Merge "Update notification layouts to match redlines" into lmp-dev 2014-08-21 15:21:22 +00:00
Kenny Guy
6460657d0e Replicate text and sounds settings for managed profile. 
Replicate touch sound / vibrate setting and show password
setting between managed and parent user.

Bug: 17064707,17157511
Change-Id: I70ea9f2ac57ba5a8f9619b21eb7adad91011d733
 2014-08-21 16:19:35 +01:00
Jorim Jaggi
445d3c0a6f Update notification layouts to match redlines 
Also fixes a lot of paddings and other small issues with
the notification layouts.

Bug: 15437369
Change-Id: I40b6c69afc160c498b7e2e709814b5b847f615de
 2014-08-21 17:13:55 +02: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
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
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
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
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
Paul Jensen
55298581a0 Send captive portal broadcast as user CURRENT. 
Previously this was sent without a qualifying user.

bug:17138439
Change-Id: I6345f2375fee168f86c0611e76f869e7377befbe
 2014-08-21 13:02:31 +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
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
5e5ee9945b Merge "Fixed spelling of android.nominative and updated some comments." into lmp-dev 2014-08-21 11:33:01 +00:00