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

149604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Esteban Talavera
ed8cf270ae am 58dada0d: Merge "Remove setApplicationsHidden" into lmp-dev 
* commit '58dada0df65027cad970351b981f526e80052aef':
  Remove setApplicationsHidden
 2014-08-21 14:25:07 +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
Nicolas Prevot
da115ebe70 In startActivityAsCaller, changing the way we get the userId. 
BUG: 17170098

Change-Id: Ie7fbd547b664a9982895b77da1fbb28df139ce52
 2014-08-21 14:40:06 +01: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
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
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
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
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
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
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
Junda Liu
018ddd809b am ace7e722: Merge "Add getCdmaMdn and getCdmaMin as system api to telmgr." into lmp-dev 
* commit 'ace7e722cf0cd1aacf0ee39fe2fbd8fde61ca98e':
  Add getCdmaMdn and getCdmaMin as system api to telmgr.
 2014-08-21 04:49:19 +00:00
Junda Liu
cad78a801d Merge "Add getCdmaMdn and getCdmaMin as system api to telmgr." into lmp-dev 2014-08-21 04:43:39 +00:00
Wei Wang
15507d929e am 50a32a5e: Merge "Fix threading issue for advertising." into lmp-dev 
* commit '50a32a5e1d86cbfca574e73698daf50c2bf81fc4':
  Fix threading issue for advertising.
 2014-08-21 04:20:33 +00:00
Wei Wang
7cb10ac392 Merge "Fix threading issue for advertising." into lmp-dev 2014-08-21 04:10:51 +00:00
Jae Seo
841d3245ab am 9c179483: API Review: android.media.tv 
* commit '9c179483cb20f1933563a73dee85106694a06d1b':
  API Review: android.media.tv
 2014-08-21 04:10:09 +00:00
Jae Seo
14355950d5 API Review: android.media.tv 
TvContentRating:
- The XML file: attributes should have android: prefix and should allow
  string resource references for labels.

Bug: 17114406
Change-Id: Ife2f4dc6c2c8a5a1714cdeedb27aab40fce73e2b
 2014-08-20 20:59:51 -07:00
Jinsuk Kim
e9f6ed3b11 CEC: Invoke input change for RAP request from MHL device 
Transform RAP[ContentOn/Off] to input change event.

Bug: 17141884
Change-Id: Ic2d8e305f482ebb4f4f3b3e167f726a66dc174cf
 2014-08-21 12:54:18 +09:00
Svet Ganov
38676f370e am 2b86b50b: Merge "Notify app widget hosts when cross-profile providers change." into lmp-dev 
* commit '2b86b50b0f79b24cc2e738469dbfc2e0dc110cdb':
  Notify app widget hosts when cross-profile providers change.
 2014-08-21 02:02:56 +00:00
Svetoslav
c3c5ad6fdf am 0ab2d34b: Merge "Using default system icon for print spooler" into lmp-dev 
* commit '0ab2d34bb6a182fc15994c3e212ea458a5f048f7':
  Using default system icon for print spooler
 2014-08-21 02:02:52 +00:00
Svetoslav
748b9a1638 am d5f8a500: Merge "Update the "More options" button in printing." into lmp-dev 
* commit 'd5f8a5008cf56e33b5bd99ed8ef80179691e0966':
  Update the "More options" button in printing.
 2014-08-21 02:02:44 +00:00
Wei Wang
88d35d0c39 am b6f53353: Merge "Fix race condition for BluetoothLeScanner." into lmp-dev 
* commit 'b6f533534fce404f00b519ad963bf614747853cb':
  Fix race condition for BluetoothLeScanner.
 2014-08-21 02:02:39 +00:00
Christopher Tate
04d3cc02e2 am 54eaf4f8: Merge "Maintain transport connection through package updates" into lmp-dev 
* commit '54eaf4f85277483743827c52530df407e720a046':
  Maintain transport connection through package updates
 2014-08-21 01:44:54 +00:00
Adam Powell
3857746ee5 am 74f2ad5d: Merge "Fix measurement regression in ActionBarContainer" into lmp-dev 
* commit '74f2ad5da40a186d78647e4ab31bb39ad9a58957':
  Fix measurement regression in ActionBarContainer
 2014-08-21 01:28:15 +00:00
RoboErik
93b4662531 Set transport control flags when a session is created 
Some apps only set the transport control flags once when their service
starts. This was leading to them not getting set when a session is
created on their behalf in RCC. This sets the flags when a session
is created if needed.

bug:16822064
Change-Id: Iea1ebf7747b3059101eb3c36b143b594cc51e114
 2014-08-20 18:19:30 -07:00
Robert Greenwalt
d4aba7aa88 am 251ccb52: Merge "Add config resource to overlay tcp buffer sizes." into lmp-dev 
* commit '251ccb52dff69b2e91b8795756d8ef1a2dd46386':
  Add config resource to overlay tcp buffer sizes.
 2014-08-21 01:15:44 +00:00
Robert Greenwalt
78da155fd4 am 3a494857: Merge "Avoid reusing a currently active NetID." into lmp-dev 
* commit '3a494857919ee37e1decb9c09e6f663ede89b271':
  Avoid reusing a currently active NetID.
 2014-08-21 01:15:38 +00:00
Robert Greenwalt
330be3f207 am c0674366: Merge "Fix listening NetworkRequests to listen for all networks." into lmp-dev 
* commit 'c067436609984a06fd95355b06e180ef8d9801e1':
  Fix listening NetworkRequests to listen for all networks.
 2014-08-21 01:15:33 +00:00
Robert Greenwalt
80eecc3401 am 7f07196d: Merge "Add missing break statements to avoid unnecessary network validation." into lmp-dev 
* commit '7f07196d232adb4e78f9e43d5bd1e28d39ec832e':
  Add missing break statements to avoid unnecessary network validation.
 2014-08-21 01:15:29 +00:00
Robert Greenwalt
090dcee5a7 am dd387b4a: Merge "Fix CS/NetworkMonitor race." into lmp-dev 
* commit 'dd387b4a63394918c758c745995f4f09785dfccc':
  Fix CS/NetworkMonitor race.
 2014-08-21 01:15:14 +00:00