Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
3946c7ab46 am 7ed62e4e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
automerge: d2a6bd5  -s ours

* commit 'd2a6bd52d650ecfe0b2c39630568b434a82e3ee0':
  Import translations. DO NOT MERGE
 2014-11-03 14:51:49 +00:00
Geoff Mendal
d2a6bd52d6 am 7ed62e4e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '7ed62e4e947df28175d71a637d74d590f36dcb24':
  Import translations. DO NOT MERGE
 2014-11-03 14:50:47 +00:00
Christoph Studer
f3aa1c8d79 Merge "SysUI: Use mScreenOnFromKeyguard for panel visibility" into lmp-mr1-dev 2014-11-03 14:49:17 +00:00
Jason Monk
52eb811a44 am 8efeae7e: am 2e647efe: Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev automerge: 5c69f5b 
* commit '8efeae7eb4da19bd3dcf1a5013e3011d50f2ca42':
  Move LOCK_TO_APP_EXIT_LOCKED from System to Secure
 2014-11-03 14:48:48 +00:00
Geoff Mendal
71cb50e269 Import translations. DO NOT MERGE 
Change-Id: Ia57971f3a657a338508d7d51c727cb0df25ae106
Auto-generated-cl: translation import
 2014-11-03 06:48:47 -08:00
Geoff Mendal
7ed62e4e94 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-03 14:46:11 +00:00
Geoff Mendal
6733743d6e Import translations. DO NOT MERGE 
Change-Id: I93f51ef821e604f91d7323c953a98bea7ef8204c
Auto-generated-cl: translation import
 2014-11-03 06:43:47 -08:00
Narayan Kamath
d449a008a0 am cd4910ef: am 2e1bd46a: am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API.""" 
* commit 'cd4910ef606e1fa8c974c348174ee55a65541cb6':
  Revert "Revert "Remove unused apache related API.""
 2014-11-03 14:42:49 +00:00
Jason Monk
8efeae7eb4 am 2e647efe: Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev 
automerge: 5c69f5b

* commit '5c69f5b276b65bd4b8000d2b6e56baddccf89846':
  Move LOCK_TO_APP_EXIT_LOCKED from System to Secure
 2014-11-03 14:42:18 +00:00
Jason Monk
5c69f5b276 am 2e647efe: Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev 
* commit '2e647efe01dcdb82d2d7f8a23540ba6b690a95d6':
  Move LOCK_TO_APP_EXIT_LOCKED from System to Secure
 2014-11-03 14:41:07 +00:00
Narayan Kamath
cd4910ef60 am 2e1bd46a: am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API.""" 
* commit '2e1bd46a1567fa987df04dd8eef66e91b50ef4f3':
  Revert "Revert "Remove unused apache related API.""
 2014-11-03 14:38:02 +00:00
Nicolas Prevot
0e2b73f685 An intent forwarded from a chooser intent will be a chooser too. 
If a chooser intent is fired:
If the user picks "work" or "personal apps":
send a chooser intent to the other profile instead of sending a normal intent.

Also using a userId instead of a userHandle for the target user.

BUG:16514027

Change-Id: I2e45cd57ad72e9b7280e772b31fc10938642ba59
 2014-11-03 14:36:11 +00:00
Jason Monk
2e647efe01 Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-dev 2014-11-03 14:36:02 +00:00
Narayan Kamath
2e1bd46a15 am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API.""" 
* commit 'ef5d43a7cf694ffac8b0069aa5026862d6b32735':
  Revert "Revert "Remove unused apache related API.""
 2014-11-03 14:31:11 +00:00
Geoff Mendal
9aff871e55 Import translations. DO NOT MERGE 
Change-Id: I3b95e959238549b4b9d37628441b94023f77ef3f
Auto-generated-cl: translation import
 2014-11-03 06:30:03 -08:00
Narayan Kamath
ef5d43a7cf Merge "Revert "Revert "Remove unused apache related API.""" 2014-11-03 14:24:17 +00:00
Narayan Kamath
4b8f1846ca Revert "Revert "Remove unused apache related API."" 
This reverts commit 31f54ef815.

Change-Id: Ib8fc22e3a23b2c06400cd687e8ed9cef9a11d09b
 2014-11-03 13:32:10 +00:00
Narayan Kamath
3455c5c93e am 4a51d064: am 9301eafb: Merge "Fix getPackageInfo("android") in the system server." into lmp-mr1-dev automerge: 726e9ea 
* commit '4a51d06402ae59b49cf0e99d05a82f71500ffe08':
  Fix getPackageInfo("android") in the system server.
 2014-11-03 12:57:39 +00:00
Narayan Kamath
4a51d06402 am 9301eafb: Merge "Fix getPackageInfo("android") in the system server." into lmp-mr1-dev 
automerge: 726e9ea

* commit '726e9ea7322d5122a22a0077d58ae92870962df4':
  Fix getPackageInfo("android") in the system server.
 2014-11-03 12:52:14 +00:00
Narayan Kamath
726e9ea732 am 9301eafb: Merge "Fix getPackageInfo("android") in the system server." into lmp-mr1-dev 
* commit '9301eafbcc39f9cf6980f937f78886f35dec9d9f':
  Fix getPackageInfo("android") in the system server.
 2014-11-03 12:50:46 +00:00
Narayan Kamath
9301eafbcc Merge "Fix getPackageInfo("android") in the system server." into lmp-mr1-dev 2014-11-03 12:45:16 +00:00
Sander Alewijnse
f654533f2d Show message when intent is forwarded across profiles. 
In resolver activity. Solution uses the contentUserHint.

Bug:17199630
Change-Id: I208e55a2bb37c7cd147240986c7659fc66f3e228
 2014-11-03 11:59:33 +00:00
Santos Cordon
71a4f2129f am 082f4978: am 04f3eebe: am 27be7b35: Merge "Split Telecom PhoneAccount registration permissions." into lmp-mr1-dev 
* commit '082f49786ec25b254992781a5ad3c67e75ceb8ee':
  Split Telecom PhoneAccount registration permissions.
 2014-11-03 08:09:40 +00:00
Santos Cordon
5627753e99 am 488ceaa0: am a79cf3c1: am 58ef48cb: Merge "Even, Even more telecom javadoc." into lmp-mr1-dev 
* commit '488ceaa0a96eddf01b103b70a0bd31e0239cd53d':
  Even, Even more telecom javadoc.
 2014-11-03 08:09:35 +00:00
Santos Cordon
082f49786e am 04f3eebe: am 27be7b35: Merge "Split Telecom PhoneAccount registration permissions." into lmp-mr1-dev 
* commit '04f3eebe0de60f6d1ac7e64eb04136734aeb1d34':
  Split Telecom PhoneAccount registration permissions.
 2014-11-03 08:05:00 +00:00
Santos Cordon
488ceaa0a9 am a79cf3c1: am 58ef48cb: Merge "Even, Even more telecom javadoc." into lmp-mr1-dev 
* commit 'a79cf3c12dc0acb1d489457cd6b79f4899fa5491':
  Even, Even more telecom javadoc.
 2014-11-03 08:04:54 +00:00
Santos Cordon
04f3eebe0d am 27be7b35: Merge "Split Telecom PhoneAccount registration permissions." into lmp-mr1-dev 
* commit '27be7b3586dcf87da4badd55693de4fc1c0bfaa7':
  Split Telecom PhoneAccount registration permissions.
 2014-11-03 07:59:16 +00:00
Santos Cordon
a79cf3c12d am 58ef48cb: Merge "Even, Even more telecom javadoc." into lmp-mr1-dev 
* commit '58ef48cb2b8eb44766bc32b9fe41e86596a5ae74':
  Even, Even more telecom javadoc.
 2014-11-03 07:59:11 +00:00
Santos Cordon
27be7b3586 Merge "Split Telecom PhoneAccount registration permissions." into lmp-mr1-dev 2014-11-03 07:54:05 +00:00
Santos Cordon
58ef48cb2b Merge "Even, Even more telecom javadoc." into lmp-mr1-dev 2014-11-03 07:53:40 +00:00
Dongwon Kang
79d2b4c810 TIF: Fix a typo and remove an unused method in TvInputService 
Change-Id: I2c0233678c08a7070ffe507d9671e1ab669fdfd8
 2014-11-03 16:04:12 +09:00
Dongwon Kang
6dd6aac9ef am 099003bd: am 664eddfd: am 4dd56c93: TIF: Add more documentation on start/end time of TvContract.Program 
* commit '099003bd20108ee5f2c5cdd00b78fc1779385714':
  TIF: Add more documentation on start/end time of TvContract.Program
 2014-11-03 04:23:57 +00:00
Dongwon Kang
099003bd20 am 664eddfd: am 4dd56c93: TIF: Add more documentation on start/end time of TvContract.Program 
* commit '664eddfdc76cbe17f8b26d65528335d5430a6874':
  TIF: Add more documentation on start/end time of TvContract.Program
 2014-11-03 04:19:40 +00:00
Dongwon Kang
664eddfdc7 am 4dd56c93: TIF: Add more documentation on start/end time of TvContract.Program 
* commit '4dd56c93e363aeb10ce94a57a33e8fe4f60e226a':
  TIF: Add more documentation on start/end time of TvContract.Program
 2014-11-03 04:16:34 +00:00
Dongwon Kang
4dd56c93e3 TIF: Add more documentation on start/end time of TvContract.Program 
Bug: 18163685
Change-Id: Ifcd57330eb341adfbcb7fcf3482a701471bf729f
 2014-11-03 10:58:00 +09:00
Nick Kralevich
021e5db2b6 fix build 
Change-Id: I57f96d3341485a906049c90808fb321a0111e880
 2014-11-01 22:26:45 -07:00
Nick Kralevich
bfed827028 partially fix build. 
Addresses the following compile time errors:

  In file included from frameworks/base/libs/hwui/LayerRenderer.cpp:24:0:
  frameworks/base/libs/hwui/RenderState.h:77:24: error: 'VirtualLightRefBase' has not been declared
       void postDecStrong(VirtualLightRefBase* object);
                        ^
  In file included from frameworks/base/libs/hwui/LayerCache.h:21:0,
                   from frameworks/base/libs/hwui/LayerRenderer.cpp:25:
  frameworks/base/libs/hwui/Layer.h:55:42: error: expected class-name before '{' token
   class Layer : public VirtualLightRefBase {
                                          ^
  In file included from frameworks/base/libs/hwui/RenderState.cpp:16:0:
  frameworks/base/libs/hwui/RenderState.h:77:24: error: 'VirtualLightRefBase' has not been declared
       void postDecStrong(VirtualLightRefBase* object);
                        ^

Change-Id: I2be439b373ea356b861f413ff6ce323e8d9baf2d
 2014-11-01 18:37:39 -07:00
Scott Rowe
2042e40b96 am 201805a4: am 8d262c3a: am 20ee9f12: am de740985: am aa275bf9: Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs automerge: 4e439d0 
* commit '201805a49f57edd576eb59eeb4eee3088841a101':
  docs: b/15180738 - invalid urls in badge generator
 2014-11-01 17:51:42 +00:00
Jeff Brown
78c4705af2 am e05fb136: am 13f00f07: Implement multi-press behavior for power key. automerge: a71601a automerge: 634ffc4 
* commit 'e05fb136cd3e9748410ba31e370cce0f81c090b6':
  Implement multi-press behavior for power key.
 2014-11-01 17:51:21 +00:00
Jeff Brown
b3d18f2c2e am 5177979b: am e333e674: Add a function to boost screen brightness temporarily. automerge: 0ed053e automerge: a80162f 
* commit '5177979bbd7459179648057ba00a6399aeb26357':
  Add a function to boost screen brightness temporarily.
 2014-11-01 17:51:16 +00:00
Nick Kralevich
f972e5a11b resolved conflicts for merge of ae59e01c to master 
Change-Id: I0a29b44009ef05e8171b3a057996facca4114df0
 2014-11-01 10:47:30 -07:00
Joe Fernandez
c05740018e am 12e76b99: am 0e4ef673: am 89e73a1c: am ea17fdec: Merge "docs:studio-updates-814v2" into lmp-docs automerge: a1caad9 automerge: c312071 
* commit '12e76b995dafc167ad8eb96f3d25de5af33be1f6':
  docs:studio-updates-814v2
 2014-11-01 17:41:11 +00:00
smain@google.com
8543208e20 am f1c86b51: am 515daeea: am 307bcbe3: am 26bf2f7b: revise helpouts tags to use just one on each page automerge: f417409 automerge: 8788850 
* commit 'f1c86b51caf4b4d70751d165293c834858a26adf':
  revise helpouts tags to use just one on each page
 2014-11-01 17:41:07 +00:00
smain@google.com
a564f7bf94 am a004c2ec: am 9b00d795: am 0da6b005: revise helpouts tags to use just one on each page automerge: b2b3b37 automerge: 07c9807 
* commit 'a004c2ec06a5ba3d65786e50171d8cdbb80515c8':
  revise helpouts tags to use just one on each page
 2014-11-01 17:41:03 +00:00
Alex Klyubin
e55c4f43df am a409cdf1: am dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs automerge: 2f1c76f automerge: 42340b9 
* commit 'a409cdf161664666e15f337ea5a0efd078667352':
  Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
 2014-11-01 17:40:58 +00:00
Ricardo Cervera
158183c79a am fd8184e4: am 84ca5ddb: am bdb1cf0c: Merge "docs: Add links to Wear UI training from Design pages." into lmp-dev automerge: 84a48b0 automerge: 721b1d3 
* commit 'fd8184e4247f81f6027ae3cc328e8a19869c2d5e':
  docs: Add links to Wear UI training from Design pages.
 2014-11-01 17:40:53 +00:00
Nick Kralevich
31a378efbf resolved conflicts for merge of 85118849 to master 
Change-Id: Ic4d98e2804dddf3a7fe58bea99f0a4b22ebd605d
 2014-11-01 10:35:47 -07:00
Scott Rowe
201805a49f am 8d262c3a: am 20ee9f12: am de740985: am aa275bf9: Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs 
automerge: 4e439d0

* commit '4e439d0312b753b1162519baa473e5358c842069':
  docs: b/15180738 - invalid urls in badge generator
 2014-11-01 16:54:34 +00:00
Scott Rowe
4e439d0312 am 8d262c3a: am 20ee9f12: am de740985: am aa275bf9: Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs 
* commit '8d262c3a033b9123f42a8ad1a3925684264b8450':
  docs: b/15180738 - invalid urls in badge generator
 2014-11-01 16:47:16 +00:00
Scott Rowe
8d262c3a03 am 20ee9f12: am de740985: am aa275bf9: Merge "docs: b/15180738 - invalid urls in badge generator" into lmp-docs 
* commit '20ee9f122da1572ffb4e9a76eddc71180a4e608d':
  docs: b/15180738 - invalid urls in badge generator
 2014-11-01 16:42:02 +00:00