Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
238,685 Commits 3 Branches 0 Tags
175cb175df4305d40e247c0f7350aa4c166dfb4d
Commit Graph

56834 Commits

Author SHA1 Message Date
Suprabh Shukla
6a643dbee7 Merge "Calling method in DPMS after resolving userId" into nyc-dev am: d7924b6063 
am: 06a3c6d32c

* commit '06a3c6d32c0c70457c7eb5eccf3395e867fb3b61':
  Calling method in DPMS after resolving userId
 2016-03-09 22:02:22 +00:00
Suprabh Shukla
06a3c6d32c Merge "Calling method in DPMS after resolving userId" into nyc-dev 
am: d7924b6063

* commit 'd7924b60635d62f2df888b53dc3ef27d9947133c':
  Calling method in DPMS after resolving userId
 2016-03-09 21:58:10 +00:00
Suprabh Shukla
d7924b6063 Merge "Calling method in DPMS after resolving userId" into nyc-dev 2016-03-09 21:50:44 +00:00
Kirill Grouchnikov
73bbdfe3fd Merge "Tweaks to ViewOverlay." into nyc-dev am: 04c659299f 
am: 44f19eebb2

* commit '44f19eebb2e58677fc955b35701ed352d8ff1852':
  Tweaks to ViewOverlay.
 2016-03-09 21:42:38 +00:00
Kirill Grouchnikov
44f19eebb2 Merge "Tweaks to ViewOverlay." into nyc-dev 
am: 04c659299f

* commit '04c659299f3ef9ca82a40e068695473add350ea4':
  Tweaks to ViewOverlay.
 2016-03-09 21:40:38 +00:00
Suprabh Shukla
8bea73e5c1 Calling method in DPMS after resolving userId 
ActivityManagerService was calling
hasDeviceOwnerOrProfileOwner in DevicePolicyManagerService.LocalService
before resolving negative userIds to a real user. Moved the call to a point
when userId is already resolved.

bug: b/27538249
Change-Id: I760412978b3260523e9abcfe59d8e100ec4af12f
 2016-03-09 13:38:15 -08:00
Kirill Grouchnikov
04c659299f Merge "Tweaks to ViewOverlay." into nyc-dev 2016-03-09 21:35:46 +00:00
Kirill Grouchnikov
b4b939cf1a Tweaks to ViewOverlay. 
* Clarify Javadocs for add / remove when called with the same
Drawable.
* Add @NonNull annotation to all add / remove APIs and throw
IllegalArgumentException when null value is passed.

Bug: 27528798
Change-Id: Ied8f28c70775309e4fa85aff6a7202c1a0eb6aa3
 2016-03-09 16:34:49 -05:00
Chad Brubaker
aa910eefe8 Merge "Allow debug-overrides to be specified in an extra resource" into nyc-dev am: 8064b4a687 
am: ff400f3229

* commit 'ff400f322908d177a0561eea6ac473f2fcd7de29':
  Allow debug-overrides to be specified in an extra resource
 2016-03-09 20:52:24 +00:00
Chad Brubaker
ff400f3229 Merge "Allow debug-overrides to be specified in an extra resource" into nyc-dev 
am: 8064b4a687

* commit '8064b4a687b41377bff5ea767dedc9c8a366cb51':
  Allow debug-overrides to be specified in an extra resource
 2016-03-09 20:50:14 +00:00
Chad Brubaker
8064b4a687 Merge "Allow debug-overrides to be specified in an extra resource" into nyc-dev 2016-03-09 20:45:23 +00:00
Alan Viverette
799c311d83 Merge "Clean up SimpleMonthView formatters" into nyc-dev am: 366e137c0e 
am: 60adb4d264

* commit '60adb4d264fd4be3277a5b80d8021aa1b4d79107':
  Clean up SimpleMonthView formatters
 2016-03-09 18:51:00 +00:00
Alan Viverette
60adb4d264 Merge "Clean up SimpleMonthView formatters" into nyc-dev 
am: 366e137c0e

* commit '366e137c0e6afe420131560c5783627ed9e06625':
  Clean up SimpleMonthView formatters
 2016-03-09 18:48:54 +00:00
Alan Viverette
366e137c0e Merge "Clean up SimpleMonthView formatters" into nyc-dev 2016-03-09 18:40:47 +00:00
Chris Wren
52165a7ab0 Merge "add a ranking service to the rocket" into nyc-dev am: a82662e3f5 
am: 2be6b136a8

* commit '2be6b136a8d0f5de12a8e1f5a3c17c8b4fe27cf1':
  add a ranking service to the rocket
 2016-03-09 16:52:05 +00:00
Chris Wren
2be6b136a8 Merge "add a ranking service to the rocket" into nyc-dev 
am: a82662e3f5

* commit 'a82662e3f5d6a36df9d5c0d33d5847d08273bd93':
  add a ranking service to the rocket
 2016-03-09 16:47:46 +00:00
Alan Viverette
c6dfb332ba Merge "Set DatePickerListener last during DatePickerDialog construction" into nyc-dev am: 2c18cd0823 
am: 669b25d58e

* commit '669b25d58e6b8840f39c95f76c79ab90c46e27e7':
  Set DatePickerListener last during DatePickerDialog construction
 2016-03-09 16:31:06 +00:00
Robin Lee
4a23e41cb4 Merge "Corrections to javadoc for install & removeKeyPair" into nyc-dev am: 9acee934de 
am: c3152fe087

* commit 'c3152fe08749c12f017598a37e65277c180f05b6':
  Corrections to javadoc for install & removeKeyPair
 2016-03-09 16:31:05 +00:00
Alan Viverette
669b25d58e Merge "Set DatePickerListener last during DatePickerDialog construction" into nyc-dev 
am: 2c18cd0823

* commit '2c18cd082359533d326081756b4fd2df2164a253':
  Set DatePickerListener last during DatePickerDialog construction
 2016-03-09 16:28:52 +00:00
Robin Lee
c3152fe087 Merge "Corrections to javadoc for install & removeKeyPair" into nyc-dev 
am: 9acee934de

* commit '9acee934de1f2242f29a57a854df837e8f38fa04':
  Corrections to javadoc for install & removeKeyPair
 2016-03-09 16:28:51 +00:00
Chris Wren
a82662e3f5 Merge "add a ranking service to the rocket" into nyc-dev 2016-03-09 16:26:56 +00:00
Alan Viverette
2c18cd0823 Merge "Set DatePickerListener last during DatePickerDialog construction" into nyc-dev 2016-03-09 15:52:35 +00:00
Robin Lee
9acee934de Merge "Corrections to javadoc for install & removeKeyPair" into nyc-dev 2016-03-09 15:48:25 +00:00
Robin Lee
a1b290e11a Corrections to javadoc for install & removeKeyPair 
Making these more consistent - refer to 'certificate and private key
pair' in titles instead of 'credentials'. It is still used in one place
where 'credentials' makes sense.

Bug: 27533004
Change-Id: Ied80017c6f391646b10921b011be35eea113373f
 2016-03-09 14:38:36 +00:00
Paul Lawrence
8977af6dd9 Merge "Add API to IMountService to get encryption state" into nyc-dev am: d5a3f3df40 
am: 3cb05abdb2

* commit '3cb05abdb2d702af01e84e54cfcaa3008d2116b6':
  Add API to IMountService to get encryption state
 2016-03-09 13:57:20 +00:00
Paul Lawrence
3cb05abdb2 Merge "Add API to IMountService to get encryption state" into nyc-dev 
am: d5a3f3df40

* commit 'd5a3f3df4097e4a57e0d31fba994c91d8996abf8':
  Add API to IMountService to get encryption state
 2016-03-09 13:48:43 +00:00
Paul Lawrence
d5a3f3df40 Merge "Add API to IMountService to get encryption state" into nyc-dev 2016-03-09 13:42:41 +00:00
Gustav Sennton
d614403fe9 Merge "Allow disk reads during more parts of WebView loading." into nyc-dev am: c48b082dbb 
am: e3958be429

* commit 'e3958be4292dd9ab9e5a88c6b61038c43b02f8c6':
  Allow disk reads during more parts of WebView loading.
 2016-03-09 13:07:32 +00:00
Gustav Sennton
e3958be429 Merge "Allow disk reads during more parts of WebView loading." into nyc-dev 
am: c48b082dbb

* commit 'c48b082dbb4ad3ac8eab3791d0082e15839e20a0':
  Allow disk reads during more parts of WebView loading.
 2016-03-09 13:05:31 +00:00
Gustav Sennton
c48b082dbb Merge "Allow disk reads during more parts of WebView loading." into nyc-dev 2016-03-09 12:59:03 +00:00
Martijn Coenen
6e05f27bff Merge "API to query which cores are exclusively assigned." into nyc-dev am: 2612bbc0f5 
am: a249556f80

* commit 'a249556f80a88aa359d44fd71d6c8163c6a5b064':
  API to query which cores are exclusively assigned.
 2016-03-09 10:39:48 +00:00
Martijn Coenen
a249556f80 Merge "API to query which cores are exclusively assigned." into nyc-dev 
am: 2612bbc0f5

* commit '2612bbc0f5ae5422ba3e8e685ae375b2b8626fda':
  API to query which cores are exclusively assigned.
 2016-03-09 10:37:45 +00:00
Martijn Coenen
2612bbc0f5 Merge "API to query which cores are exclusively assigned." into nyc-dev 2016-03-09 10:31:03 +00:00
Tony Mak
355443f892 Merge "Update comment about enterprise contact id and lookup key" into nyc-dev am: 41371b5fe0 
am: 2997ac4b0a

* commit '2997ac4b0ab18c9ce1f63b8993fa0fa3bcf4c53a':
  Update comment about enterprise contact id and lookup key
 2016-03-09 10:12:24 +00:00
Tony Mak
2997ac4b0a Merge "Update comment about enterprise contact id and lookup key" into nyc-dev 
am: 41371b5fe0

* commit '41371b5fe00411ad46a95dc389e4d5d12118422f':
  Update comment about enterprise contact id and lookup key
 2016-03-09 10:10:23 +00:00
Tony Mak
41371b5fe0 Merge "Update comment about enterprise contact id and lookup key" into nyc-dev 2016-03-09 10:05:27 +00:00
Keisuke Kuroyanagi
5f35184834 Merge "Make drag&drop be atomic for undo/redo." into nyc-dev am: 12298bb64c 
am: 195c688756

* commit '195c6887564ab3fba8716b01d083f87de9c2e945':
  Make drag&drop be atomic for undo/redo.
 2016-03-09 07:20:17 +00:00
Keisuke Kuroyanagi
195c688756 Merge "Make drag&drop be atomic for undo/redo." into nyc-dev 
am: 12298bb64c

* commit '12298bb64ce5bd92c826328258a6c767d54d4cd3':
  Make drag&drop be atomic for undo/redo.
 2016-03-09 07:18:13 +00:00
Keisuke Kuroyanagi
fae4578311 Make drag&drop be atomic for undo/redo. 
For undo/redo, drag&drop is recorded as a 2 operations, paste and
delete. This CL makes drag&drop be atomic operation to be properly
undoed/redoed.

Bug: 27268820
Change-Id: Ia38d663f046c2c65f348985934f5cfa054b0437e
 2016-03-09 06:07:01 +00:00
Shuzhen Wang
92630d0b22 Merge "Camera2: Handle binder death on ICameraDeviceUser" into nyc-dev am: f52ebd119e 
am: a9382b068e

* commit 'a9382b068ede089f3e19744d67cd2d27ab7c32d3':
  Camera2: Handle binder death on ICameraDeviceUser
 2016-03-09 03:48:59 +00:00
Shuzhen Wang
a9382b068e Merge "Camera2: Handle binder death on ICameraDeviceUser" into nyc-dev 
am: f52ebd119e

* commit 'f52ebd119e76187366e9f9d0f388fbdef46a33c8':
  Camera2: Handle binder death on ICameraDeviceUser
 2016-03-09 03:47:04 +00:00
Shuzhen Wang
f52ebd119e Merge "Camera2: Handle binder death on ICameraDeviceUser" into nyc-dev 2016-03-09 03:43:01 +00:00
Muyuan Li
da5022650e Merge "Partial screenshot" into nyc-dev am: a8446ef782 
am: 26aac3978d

* commit '26aac3978d0b333777f5258866cd2950b7731f46':
  Partial screenshot
 2016-03-09 02:44:56 +00:00
Muyuan Li
26aac3978d Merge "Partial screenshot" into nyc-dev 
am: a8446ef782

* commit 'a8446ef7826783056af70d82815df83e8aa96031':
  Partial screenshot
 2016-03-09 02:42:45 +00:00
Muyuan Li
a8446ef782 Merge "Partial screenshot" into nyc-dev 2016-03-09 02:36:52 +00:00
Makoto Onuki
3b0196122f Merge "Implement LauncherApps.startShortcut()." into nyc-dev am: 76cb56bb21 
am: 6e6a3ed250

* commit '6e6a3ed2502e5e6b07403a21e8e954a200fb0146':
  Implement LauncherApps.startShortcut().
 2016-03-09 01:47:10 +00:00
Makoto Onuki
6e6a3ed250 Merge "Implement LauncherApps.startShortcut()." into nyc-dev 
am: 76cb56bb21

* commit '76cb56bb210a2ffeeda6294b8cde2dd971c495a7':
  Implement LauncherApps.startShortcut().
 2016-03-09 01:43:46 +00:00
Makoto Onuki
76cb56bb21 Merge "Implement LauncherApps.startShortcut()." into nyc-dev 2016-03-09 01:38:37 +00:00
Abhijith Shastry
f988290d3b Merge "Document that emergency numbers will not be blocked by the platform." into nyc-dev am: d1a766e820 
am: 3aea500d9b

* commit '3aea500d9b61b44e8d14a59283127e97dcde8558':
  Document that emergency numbers will not be blocked by the platform.
 2016-03-09 01:28:54 +00:00
Abhijith Shastry
3aea500d9b Merge "Document that emergency numbers will not be blocked by the platform." into nyc-dev 
am: d1a766e820

* commit 'd1a766e820115ed5ce743e819402d6b52ab8036d':
  Document that emergency numbers will not be blocked by the platform.
 2016-03-09 01:26:59 +00:00