Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
170,947 Commits 3 Branches 0 Tags
8094de110ee00c183928ab948a699f9e620695c3
Commit Graph

22735 Commits

Author SHA1 Message Date
Adam Lesinski
b8b49f3084 am 5231a1ed: am 49661141: am 720a5c51: Merge "Add dumpsys output to UsageStatsService, along with --checkin support" into lmp-mr1-dev 
* commit '5231a1edf4808e181daf3bfeaef5a10453929498':
  Add dumpsys output to UsageStatsService, along with --checkin support
 2014-10-31 00:25:13 +00:00
Wale Ogunwale
4147cbd4df am 75b1e8c5: am 0319e704: am a232953e: Merge "Fix issue 6455374: Bad recent image on camera launch from lockscreen." into lmp-mr1-dev 
* commit '75b1e8c5c6c8a76ae02c68679156b5c92b1a68af':
  Fix issue 6455374: Bad recent image on camera launch from lockscreen.
 2014-10-31 00:25:08 +00:00
Adam Lesinski
5231a1edf4 am 49661141: am 720a5c51: Merge "Add dumpsys output to UsageStatsService, along with --checkin support" into lmp-mr1-dev 
* commit '496611416d4da9fb4a8323dab7d270c0f9be04d7':
  Add dumpsys output to UsageStatsService, along with --checkin support
 2014-10-31 00:13:47 +00:00
Wale Ogunwale
75b1e8c5c6 am 0319e704: am a232953e: Merge "Fix issue 6455374: Bad recent image on camera launch from lockscreen." into lmp-mr1-dev 
* commit '0319e704c19deeea7cd8c93a6275ac02e565b473':
  Fix issue 6455374: Bad recent image on camera launch from lockscreen.
 2014-10-31 00:13:36 +00:00
Jeff Hao
ab3ff04d52 am 05ea3213: am 73577862: am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev 
* commit '05ea3213fd68204aa7cd9cc4b9b6a0a973f69c17':
  Change boot screen title to "Android is starting" when not upgrading.
 2014-10-31 00:00:57 +00:00
Jeff Hao
05ea3213fd am 73577862: am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev 
* commit '73577862ffe6332f326628febfa1fbb9e693bb40':
  Change boot screen title to "Android is starting" when not upgrading.
 2014-10-30 23:44:09 +00:00
Kenny Guy
b819e7b714 am a3497841: am 8cfb3f1e: Merge "Listen for package changes for all users not just owner." into lmp-mr1-dev automerge: 5cf65f7 
* commit 'a349784180f7e64a257e320799432ec12737895c':
  Listen for package changes for all users not just owner.
 2014-10-30 19:24:34 +00:00
Kenny Guy
a349784180 am 8cfb3f1e: Merge "Listen for package changes for all users not just owner." into lmp-mr1-dev 
automerge: 5cf65f7

* commit '5cf65f7bf6ca0751749bff3f8c89ff9f0a3dc9cb':
  Listen for package changes for all users not just owner.
 2014-10-30 19:18:27 +00:00
Jinsuk Kim
ec571682e8 am 2dfb7397: am 8be95fdd: Merge "CEC: Use language code "chi" for Traditional Chinese" into lmp-mr1-dev automerge: 44ce605 
* commit '2dfb7397b4c0f76c632ca7f229de4e234a425f99':
  CEC: Use language code "chi" for Traditional Chinese
 2014-10-30 19:15:40 +00:00
Lorenzo Colitti
5c313dccad am 2f3dab85: am def4cd4f: Merge "Support more than one clatd at a time." into lmp-mr1-dev automerge: ba69b3f 
* commit '2f3dab8585a1a11d2576a8b3164defe95191d513':
  Support more than one clatd at a time.
 2014-10-30 19:10:46 +00:00
Jinsuk Kim
2dfb7397b4 am 8be95fdd: Merge "CEC: Use language code "chi" for Traditional Chinese" into lmp-mr1-dev 
automerge: 44ce605

* commit '44ce60502439d4ae37a5316efaaafbbeede3cda3':
  CEC: Use language code "chi" for Traditional Chinese
 2014-10-30 19:09:06 +00:00
Lorenzo Colitti
2f3dab8585 am def4cd4f: Merge "Support more than one clatd at a time." into lmp-mr1-dev 
automerge: ba69b3f

* commit 'ba69b3f290e6fe4a579841a2dd052ca5803ba863':
  Support more than one clatd at a time.
 2014-10-30 19:07:02 +00:00
Jeff Davidson
863fbacd14 am ab3e142b: am 306eac5f: am f82b029c: Merge "Check UID instead of package name when preparing VPN." into lmp-mr1-dev 
* commit 'ab3e142b302eef822d8daa7d4bf57994aad1a290':
  Check UID instead of package name when preparing VPN.
 2014-10-30 10:26:23 +00:00
Jeff Davidson
ab3e142b30 am 306eac5f: am f82b029c: Merge "Check UID instead of package name when preparing VPN." into lmp-mr1-dev 
* commit '306eac5f41de151a1be6832f6629113eef0b10e4':
  Check UID instead of package name when preparing VPN.
 2014-10-30 10:18:12 +00:00
Elliott Hughes
8caccd4cb9 am b6e00426: am c8dce896: Merge "Fix not to show a log with empty default ime" 
automerge: 1b9813a

* commit '1b9813ad0bed9435fa4ec1631ddffc9ad5190d5f':
  Fix not to show a log with empty default ime
 2014-10-30 03:53:24 +00:00
Elliott Hughes
1b9813ad0b am b6e00426: am c8dce896: Merge "Fix not to show a log with empty default ime" 
* commit 'b6e004261cc5c1b9b9ab338ce30896f537182336':
  Fix not to show a log with empty default ime
 2014-10-30 03:19:32 +00:00
Elliott Hughes
b6e004261c am c8dce896: Merge "Fix not to show a log with empty default ime" 
* commit 'c8dce8966b84203befb87a24a9d2d8ee87a39f7b':
  Fix not to show a log with empty default ime
 2014-10-30 03:06:12 +00:00
Elliott Hughes
c8dce8966b Merge "Fix not to show a log with empty default ime" 2014-10-30 03:02:01 +00:00
Hyejin Kim
e6ef68b15a Fix not to show a log with empty default ime 
It'll make reboot to show a log with empty defualt ime.

Bug: 18165757
Change-Id: Ieec2532cbe003cb6307a70748a2f6c8987708eae
 2014-10-30 09:22:17 +09:00
Adam Lesinski
720a5c51be Merge "Add dumpsys output to UsageStatsService, along with --checkin support" into lmp-mr1-dev 2014-10-29 23:11:54 +00:00
Wale Ogunwale
a232953ea3 Merge "Fix issue 6455374: Bad recent image on camera launch from lockscreen." into lmp-mr1-dev 2014-10-29 23:08:21 +00:00
Jeff Hao
9f60c08a44 Change boot screen title to "Android is starting" when not upgrading. 
Bug: 17565501
Change-Id: Id5741e6e7a40750feee1cd7306e79f7baeec67de
 2014-10-29 14:42:39 -07:00
Andreas Gampe
174ac568cb am 955bee89: am dfdc6acc: resolved conflicts for merge of 3c8cf51f into stage-aosp-master 
* commit '955bee89abada8b6541f499c686376d4434242b1':
  Stop using apache http to download Gps XTRA data.
 2014-10-29 17:56:03 +00:00
Andreas Gampe
955bee89ab am dfdc6acc: resolved conflicts for merge of 3c8cf51f into stage-aosp-master 
* commit 'dfdc6acc4809f395b9db2136acc89b6de932a1a5':
  Stop using apache http to download Gps XTRA data.
 2014-10-29 17:47:10 +00:00
Kenny Guy
8cfb3f1e4d Merge "Listen for package changes for all users not just owner." into lmp-mr1-dev 2014-10-29 15:05:02 +00:00
Jinsuk Kim
8be95fdde6 Merge "CEC: Use language code "chi" for Traditional Chinese" into lmp-mr1-dev 2014-10-29 06:44:36 +00:00
Lorenzo Colitti
def4cd4fa4 Merge "Support more than one clatd at a time." into lmp-mr1-dev 2014-10-29 03:43:04 +00:00
Andreas Gampe
dfdc6acc48 resolved conflicts for merge of 3c8cf51f into stage-aosp-master 
Change-Id: I507358be6186c4b8d1968cd4e370afe9fd1a02eb
 2014-10-28 20:42:53 -07:00
Jinsuk Kim
5fe3a6cbfc CEC: Use language code "chi" for Traditional Chinese 
Android by default returns "zho" for all sorts of Chinese variants.
Use "chi" for traditional one used in Taiwan/Hong Kong/Macau
as required in CEC standard.

Bug: 18149804

Change-Id: I86ac7e2f0f1121641c52032a0d98a6405554457c
 2014-10-29 11:48:19 +09:00
Yohei Yukawa
7e351fdae8 Stop querying package names unnecessarily 
This is just a code clean-up.  No behavior change is intended.

BUG: 18131340
Change-Id: Ia88374cde7845553530ddd1176f983101e4ec13f
 2014-10-29 00:52:46 +00:00
Wale Ogunwale
c74b5723a4 Fix issue 6455374: Bad recent image on camera launch from lockscreen. 
When transitioning from the lockscreen to the camera app,
the previous activity that was running before the screen was
locked is briefly resumed and then paused. During the pause
we take a screenshot of the activity for recents which ends up
being an image of the wallpaper, because the activity was
moved behind the wallpaper while the lockscreen is up. With
this change we no longer include the wallpaper layer in the
screenshot if it is layered on top of the window we are
targeting for the screenshot.

Bug: 6455374
Change-Id: I305950a32c176f55eeeb6358266746e32e848383
 2014-10-28 15:13:16 -07:00
Kenny Guy
7005840d88 Listen for package changes for all users not just owner. 
Listen for package changes for all users to cancel notifications
for secondary users and profiles when an app is uninstalled.

Bug: 18151696
Change-Id: I6921729e2878e1e5890411b173a56849eb2e0745
 2014-10-28 21:32:21 +00:00
Jeff Davidson
f82b029c7c Merge "Check UID instead of package name when preparing VPN." into lmp-mr1-dev 2014-10-28 20:00:32 +00:00
Benjamin Franz
f481d6a48f am 22fd4e36: am f5c00c1c: Merge "Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed." into lmp-mr1-dev automerge: 5852369 
* commit '22fd4e36b859f7a3b4d5ea6e991effb71713e8cc':
  Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed.
 2014-10-28 18:15:55 +00:00
Adrian Roos
254a194049 am 732f4f72: am bd6f4a81: Merge "Ensure trust agents are disabled in safe-mode" into lmp-mr1-dev automerge: 98a8258 
* commit '732f4f72b5a284d86a409428d555f1a3f982d4c8':
  Ensure trust agents are disabled in safe-mode
 2014-10-28 18:11:04 +00:00
Craig Mautner
6a02e15d59 am 6ba2ec8f: am 74fe6ce7: Merge "Do not go through a layout if visibility is GONE" into lmp-mr1-dev automerge: 2381825 
* commit '6ba2ec8f93ba5cc530f448fd7f09d515cebff0e0':
  Do not go through a layout if visibility is GONE
 2014-10-28 18:10:59 +00:00
Benjamin Franz
22fd4e36b8 am f5c00c1c: Merge "Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed." into lmp-mr1-dev 
automerge: 5852369

* commit '58523698080af9bd9df49b22a591e1db9f39bf25':
  Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed.
 2014-10-28 18:04:15 +00:00
Adrian Roos
732f4f72b5 am bd6f4a81: Merge "Ensure trust agents are disabled in safe-mode" into lmp-mr1-dev 
automerge: 98a8258

* commit '98a8258dd8759722b3aedce9297023291e33d724':
  Ensure trust agents are disabled in safe-mode
 2014-10-28 18:01:18 +00:00
Craig Mautner
6ba2ec8f93 am 74fe6ce7: Merge "Do not go through a layout if visibility is GONE" into lmp-mr1-dev 
automerge: 2381825

* commit '2381825db49718891e345eebe34b58644beab10d':
  Do not go through a layout if visibility is GONE
 2014-10-28 17:59:39 +00:00
Lorenzo Colitti
954394653d Support more than one clatd at a time. 
1. Make Nat464Xlat a per-network object, one for every network
   requiring clat, instead of a ConnectivityService singleton.
2. Make the NetworkManagementService clatd commands take an
   interface.
3. When we attempt to start clatd on a network, store its
   Nat464Xlat object in the NetworkAgentInfo, so we have an
   authoritative way of knowing whether clat is running on a
   given network.
4. Rework Nat464Xlat, hopefully simplifying it.

Bug: 12111730
Change-Id: I1fa5508ef020cd1c3d1c7a1f7b06370ac5fc2ae2
 2014-10-29 01:23:26 +09:00
Benjamin Franz
f5c00c1c11 Merge "Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed." into lmp-mr1-dev 2014-10-28 16:13:05 +00:00
Adrian Roos
bd6f4a818e Merge "Ensure trust agents are disabled in safe-mode" into lmp-mr1-dev 2014-10-28 14:37:39 +00:00
Craig Mautner
74fe6ce72d Merge "Do not go through a layout if visibility is GONE" into lmp-mr1-dev 2014-10-28 13:56:09 +00:00
Christoph Studer
706e2b71ff am c1d93cf4: Merge "NoMan: Add update bit to notification_enqueue log" into lmp-mr1-dev automerge: 6857203 automerge: 3fc8118 
* commit 'c1d93cf4dcb0e406e952d635db4a6209261c915d':
  NoMan: Add update bit to notification_enqueue log
 2014-10-28 13:02:37 +00:00
Christoph Studer
c1d93cf4dc Merge "NoMan: Add update bit to notification_enqueue log" into lmp-mr1-dev automerge: 6857203 
automerge: 3fc8118

* commit '3fc811803db5f534399697dab1994e19af2a95f3':
  NoMan: Add update bit to notification_enqueue log
 2014-10-28 12:57:50 +00:00
Christoph Studer
685720309a Merge "NoMan: Add update bit to notification_enqueue log" into lmp-mr1-dev 2014-10-28 12:41:33 +00:00
Lorenzo Colitti
8a140ccfe3 am 9d6f408a: am 111cc9f5: Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev automerge: 35261c4 
* commit '9d6f408ab5a3fc12a1cae2ffba928c79df74739c':
  Change removeStackedLink to take an interface name.
 2014-10-28 08:55:55 +00:00
Lorenzo Colitti
9d6f408ab5 am 111cc9f5: Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev 
automerge: 35261c4

* commit '35261c4351ea42b2bbd057e852f50158de8eda9c':
  Change removeStackedLink to take an interface name.
 2014-10-28 08:50:41 +00:00
Jason Monk
e88b0e76f9 am 48d7a89c: Add missing passive discovery flag automerge: 4444c5b automerge: 07faf0e automerge: e585740 automerge: 8ae1a5e 
* commit '48d7a89c2c04871a4740fb444059a07e58a1bb06':
  Add missing passive discovery flag
 2014-10-28 07:17:33 +00:00
Yuncheol Heo
17de67e7c0 am 9a3e7578: Merge "CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>." into lmp-mr1-dev automerge: 571cc6b automerge: 522e0af 
* commit '9a3e75783ea36d54b808fbbca0cf44dd8f93a815':
  CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>.
 2014-10-28 07:17:25 +00:00