Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
237,751 Commits 3 Branches 0 Tags
52be4cd53d641840ea83ae18cbb42e0674970c67
Commit Graph

237751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
52be4cd53d Merge "Revert "Disable HWUI_NEW_OPS"" into nyc-dev am: 485e41d510 
am: 831cf5c5b1

* commit '831cf5c5b10ddc18bad90a2546bed5835e1720cf':
  Revert "Disable HWUI_NEW_OPS"
 2016-03-04 18:11:04 +00:00
Christopher Tate
06fe18dfa4 Merge "Don\'t use restricted backup launch mode for system-ish processes" into nyc-dev am: 2fad2ea0e6 
am: d8aaf500bb

* commit 'd8aaf500bb68f5ae87bb3b8ef7cef98fb5987fb8':
  Don't use restricted backup launch mode for system-ish processes
 2016-03-04 18:06:47 +00:00
Chris Craik
831cf5c5b1 Merge "Revert "Disable HWUI_NEW_OPS"" into nyc-dev 
am: 485e41d510

* commit '485e41d51067f9cd1f7de245533f1288e3a3d822':
  Revert "Disable HWUI_NEW_OPS"
 2016-03-04 18:05:26 +00:00
Christopher Tate
d8aaf500bb Merge "Don\'t use restricted backup launch mode for system-ish processes" into nyc-dev 
am: 2fad2ea0e6

* commit '2fad2ea0e622813ba153343e988da54ee1edbfc6':
  Don't use restricted backup launch mode for system-ish processes
 2016-03-04 18:02:43 +00:00
Chris Craik
b23c645c50 Merge "Fix clip rect snapping at non-integer scale values" into nyc-dev am: 6f270e062c 
am: 8823d90fe7

* commit '8823d90fe7204c670e0f85e6b21a6af387dc4c45':
  Fix clip rect snapping at non-integer scale values
 2016-03-04 18:02:41 +00:00
Chris Craik
8823d90fe7 Merge "Fix clip rect snapping at non-integer scale values" into nyc-dev 
am: 6f270e062c

* commit '6f270e062c15fa7b9928b8eb3ebce638e108726e':
  Fix clip rect snapping at non-integer scale values
 2016-03-04 18:00:40 +00:00
Chris Craik
485e41d510 Merge "Revert "Disable HWUI_NEW_OPS"" into nyc-dev 2016-03-04 17:58:37 +00:00
Chris Tate
2fad2ea0e6 Merge "Don't use restricted backup launch mode for system-ish processes" into nyc-dev 2016-03-04 17:57:09 +00:00
Chris Craik
6f270e062c Merge "Fix clip rect snapping at non-integer scale values" into nyc-dev 2016-03-04 17:54:33 +00:00
Yorke Lee
e1cfcfbce3 Merge "Make isPanelFullyCollapsed public" into nyc-dev am: e5ccccd3be 
am: 54d87384a8

* commit '54d87384a85c5b3926076593d0c5a2579c525602':
  Make isPanelFullyCollapsed public
 2016-03-04 17:42:47 +00:00
Yorke Lee
54d87384a8 Merge "Make isPanelFullyCollapsed public" into nyc-dev 
am: e5ccccd3be

* commit 'e5ccccd3beadcc989ba25dc57292724e8f38b574':
  Make isPanelFullyCollapsed public
 2016-03-04 17:40:19 +00:00
Yorke Lee
e5ccccd3be Merge "Make isPanelFullyCollapsed public" into nyc-dev 2016-03-04 17:36:50 +00:00
Jason Monk
04574e0075 Merge "Make QS do simpler anim on lock screen" into nyc-dev am: 84606d704a 
am: 7c6632e870

* commit '7c6632e870e0592be0b4020f726d32be4243c24f':
  Make QS do simpler anim on lock screen
 2016-03-04 16:01:32 +00:00
Jason Monk
7c6632e870 Merge "Make QS do simpler anim on lock screen" into nyc-dev 
am: 84606d704a

* commit '84606d704a5b51da270ad36285f5b16aa7674568':
  Make QS do simpler anim on lock screen
 2016-03-04 15:59:27 +00:00
Jason Monk
84606d704a Merge "Make QS do simpler anim on lock screen" into nyc-dev 2016-03-04 15:52:47 +00:00
Deepanshu Gupta
0b979a4c91 Change BridgeResources to Resources_Delegate [DO NOT MERGE] am: 9b137e27d3 -s ours am: 10b6e07717 
am: 575d06e5f3  -s ours

* commit '575d06e5f32cab1b7f40e1313ea140858417b8ab':
  Change BridgeResources to Resources_Delegate [DO NOT MERGE]
 2016-03-04 15:03:56 +00:00
Deepanshu Gupta
575d06e5f3 Change BridgeResources to Resources_Delegate [DO NOT MERGE] am: 9b137e27d3 -s ours 
am: 10b6e07717

* commit '10b6e07717f2cd80952200ddb6dabe20052e9eea':
  Change BridgeResources to Resources_Delegate [DO NOT MERGE]
 2016-03-04 15:01:51 +00:00
Deepanshu Gupta
10b6e07717 Change BridgeResources to Resources_Delegate [DO NOT MERGE] 
am: 9b137e27d3  -s ours

* commit '9b137e27d34efb89024543ffd2def2b37307aa0c':
  Change BridgeResources to Resources_Delegate [DO NOT MERGE]
 2016-03-04 14:59:55 +00:00
Deepanshu Gupta
9b137e27d3 Change BridgeResources to Resources_Delegate [DO NOT MERGE] 
Do not merge because the resource implementation has changed in N and
the change is no longer valid there.

This is a very hacky fix to make layoutlib work with the latest support
lib. Inject a couple of fields in android.content.res.Resources to
allow using most of the earlier code as is.

Bug: 27403642
Bug: http://b.android.com/201934
Change-Id: I186cad32b1b4de64164fbad937d989e0110c6976
 2016-03-04 20:18:23 +05:30
Narayan Kamath
64bf195185 Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33 (part 2). am: cda4198937 
am: a6752e50d9

* commit 'a6752e50d99c82c963799be682fd5f0759ea1b0e':
  Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33 (part 2).
 2016-03-04 13:30:04 +00:00
Narayan Kamath
a6752e50d9 Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33 (part 2). 
am: cda4198937

* commit 'cda41989379215b2d7befeaaa2f32ed1392f8893':
  Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33 (part 2).
 2016-03-04 13:28:10 +00:00
Victor Chang
4c6294208d Merge "enforceCanSetDeviceOwnerLocked should enforce userId == USER_SYSTEM for non-split user mode" into nyc-dev am: 0114263a1a 
am: 51296a5483

* commit '51296a548312799b5331714b5b581a064f80d737':
  enforceCanSetDeviceOwnerLocked should enforce userId == USER_SYSTEM for non-split user mode
 2016-03-04 13:26:44 +00:00
Narayan Kamath
cda4198937 Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33 (part 2). 
Also includes a regenerated test-current.txt.

bug: 27426688

(cherry picked from commit 7d18ce744f)

Change-Id: I754803d51d365ac1fe26c638b12efb88d23b35c6
 2016-03-04 13:24:13 +00:00
Victor Chang
cca6e9a432 Merge "isDeviceOwnerProvisioningAllowed implementation to match enforceCanSetDeviceOwnerLocked" into nyc-dev am: 915d524553 
am: 37b5fb6556

* commit '37b5fb655628233e0a866cbe4f38386ea00021bc':
  isDeviceOwnerProvisioningAllowed implementation to match enforceCanSetDeviceOwnerLocked
 2016-03-04 13:22:09 +00:00
Victor Chang
51296a5483 Merge "enforceCanSetDeviceOwnerLocked should enforce userId == USER_SYSTEM for non-split user mode" into nyc-dev 
am: 0114263a1a

* commit '0114263a1aff5dea92fdafbec81c1b40093e9aba':
  enforceCanSetDeviceOwnerLocked should enforce userId == USER_SYSTEM for non-split user mode
 2016-03-04 13:21:25 +00:00
Victor Chang
37b5fb6556 Merge "isDeviceOwnerProvisioningAllowed implementation to match enforceCanSetDeviceOwnerLocked" into nyc-dev 
am: 915d524553

* commit '915d5245533c449550b9dae54b71414394ae2d74':
  isDeviceOwnerProvisioningAllowed implementation to match enforceCanSetDeviceOwnerLocked
 2016-03-04 13:18:52 +00:00
Victor Chang
0114263a1a Merge "enforceCanSetDeviceOwnerLocked should enforce userId == USER_SYSTEM for non-split user mode" into nyc-dev 2016-03-04 13:13:27 +00:00
Victor Chang
915d524553 Merge "isDeviceOwnerProvisioningAllowed implementation to match enforceCanSetDeviceOwnerLocked" into nyc-dev 2016-03-04 13:13:14 +00:00
Neil Fuller
600461aadb Merge "Change libraries needed by layoutlib to "host" libs" am: 709bf582cf am: 8658378382 
am: 02fd042449

* commit '02fd042449e3438e3d13bc79840d6cdd21f89684':
  Change libraries needed by layoutlib to "host" libs
 2016-03-04 13:10:42 +00:00
Narayan Kamath
4a9b86fe71 Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33. am: 3e7ef62e04 
am: 62d9eafe51

* commit '62d9eafe5178197861694797ca6ab1b68bf41fb0':
  Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33.
 2016-03-04 13:08:00 +00:00
Neil Fuller
02fd042449 Merge "Change libraries needed by layoutlib to "host" libs" am: 709bf582cf 
am: 8658378382

* commit '86583783826811779caa7f6f936d5d9e700e6dc3':
  Change libraries needed by layoutlib to "host" libs
 2016-03-04 13:06:00 +00:00
Narayan Kamath
62d9eafe51 Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33. 
am: 3e7ef62e04

* commit '3e7ef62e0485282f293b41a85ad5950839d23ba4':
  Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33.
 2016-03-04 13:03:53 +00:00
Narayan Kamath
766c0ed5c7 Merge "Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33." am: 61d71016a9 am: 13232345bb 
am: 1e54b5fac2

* commit '1e54b5fac21c6bb29a67dbdbcca8c0472ae9b4b4':
  Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33.
 2016-03-04 13:03:50 +00:00
Neil Fuller
8658378382 Merge "Change libraries needed by layoutlib to "host" libs" 
am: 709bf582cf

* commit '709bf582cf949680da976e3f6cd5bf03396b1db1':
  Change libraries needed by layoutlib to "host" libs
 2016-03-04 13:03:48 +00:00
Narayan Kamath
1e54b5fac2 Merge "Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33." am: 61d71016a9 
am: 13232345bb

* commit '13232345bbd6042b7f27dad51f2df164c44330f4':
  Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33.
 2016-03-04 13:01:41 +00:00
Narayan Kamath
13232345bb Merge "Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33." 
am: 61d71016a9

* commit '61d71016a9dc6ce61ed7fb251b0e9eb83492140d':
  Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33.
 2016-03-04 12:59:47 +00:00
Neil Fuller
709bf582cf Merge "Change libraries needed by layoutlib to "host" libs" 2016-03-04 12:58:45 +00:00
Narayan Kamath
61d71016a9 Merge "Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33." 2016-03-04 12:54:59 +00:00
Narayan Kamath
1896f3d1db Merge "Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24." am: b1bf1cd066 am: ff92741c16 
am: e6e3300773

* commit 'e6e330077377979685a9fda9e60d544c6b20b18a':
  Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24.
 2016-03-04 12:53:23 +00:00
Narayan Kamath
6442a0cc8d Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24. am: 6f9845ce85 
am: 4cf9f9d877

* commit '4cf9f9d87761b0a3b2d0b1462ab237420df45f37':
  Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24.
 2016-03-04 12:49:25 +00:00
Narayan Kamath
e6e3300773 Merge "Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24." am: b1bf1cd066 
am: ff92741c16

* commit 'ff92741c1625904e746747fe9f3eefe954c8e98c':
  Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24.
 2016-03-04 12:49:22 +00:00
Narayan Kamath
ff92741c16 Merge "Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24." 
am: b1bf1cd066

* commit 'b1bf1cd066942c8b775d73396cdc986f776a4b4f':
  Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24.
 2016-03-04 12:47:17 +00:00
Narayan Kamath
4cf9f9d877 Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24. 
am: 6f9845ce85

* commit '6f9845ce850d76ce7a4e1ae05f119fe2fcb2ccc3':
  Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24.
 2016-03-04 12:47:16 +00:00
Narayan Kamath
3e7ef62e04 Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33. 
bug: 27426688

(cherry picked from commit 7d18ce744f)

Change-Id: If22e493a80958ebd57ae5cc9d0f74d9479c86211
 2016-03-04 12:46:37 +00:00
Narayan Kamath
7d18ce744f Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33. 
bug: 27426688
Change-Id: I75777707f96c463ea7054eda55bb532a67ca5501
 2016-03-04 12:45:05 +00:00
Narayan Kamath
b1bf1cd066 Merge "Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24." 2016-03-04 12:41:50 +00:00
Neil Fuller
dd24c58f1a Change libraries needed by layoutlib to "host" libs 
They are only used on host and are one of the few places
in the build that use LOCAL_JACK_ENABLED := disabled.

Bug: 27218410
(cherry picked from commit d34e33bc83)

Change-Id: I8febfca41b3e9baaf290e53ca1449254d4cc9b46
 2016-03-04 12:01:49 +00:00
Narayan Kamath
6f9845ce85 Track libcore commit 6c5284cca0ec8cf20dd6c5e9b2b6254d813e9d24. 
Includes generated changes for test-current.txt.

bug: 27426688

(cherry picked from commit de33c660df)

Change-Id: Idd323fe7458a2b124aae0009b4de83039e2ade21
 2016-03-04 11:56:49 +00:00
Victor Chang
e29cd4724f enforceCanSetDeviceOwnerLocked should enforce userId == USER_SYSTEM for non-split user mode 
Bug: 27453111
Change-Id: I1acdfecdf4474696e904a6a4df189453be306aa4
 2016-03-04 10:34:43 +00:00
Victor Chang
5676ae256a isDeviceOwnerProvisioningAllowed implementation to match enforceCanSetDeviceOwnerLocked 
The main purpose is to fix the security flaw that
user can force isDeviceOwnerProvisioningAllowed to return true
by setting the device_provisioned without factory reset

Check UserSetupComplete instead, as it's cached by DPMS if it's ever set to true

Refactor common code of isDeviceOwnerProvisioningAllowed and enforceCanSetDeviceOwnerLocked
The functionality of enforceCanSetDeviceOwnerLocked should be exactly the same.
DPM Unit Test all pass

Bug:27403225
Change-Id: I32dae8e222e01e08664abb313ead3a92d4186658
 2016-03-04 10:34:33 +00:00