Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
304,671 Commits 3 Branches 0 Tags
ee9e85f12e1bf4864435a1fe395cf31499f90b0a
Commit Graph

304671 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
ee9e85f12e Remove some unused code around process state reporting. 
Test: manual (removing stuff that wasn't tested anyway)

Change-Id: I6aec4047ecea406db5d740550b838b295d128a1a
 2017-01-25 13:33:40 -08:00
Dianne Hackborn
c5d458930c Merge "Add some new experiment constants for activity and power manager." 2017-01-25 21:12:12 +00:00
Shuzhen Wang
b44dee8e22 Merge "Camera2: Handle (0, 0) size for deferred OutputConfiguration" 2017-01-25 21:05:45 +00:00
Abodunrinwa Toki
e363f427f8 Merge "Implement TextClassifierImpl.getLinks" 2017-01-25 21:05:03 +00:00
Winson Chung
8779446466 Skip resizing the stack when there is no current bounds. 
- When initially calling loadConfigurationsAndApply(), the state is
  set to STATE_NO_PIP when there is no pinned stack.  As of change
  ag/1725150, resizeStack no longer fails silently when there is no
  such stack to resize.  This CL skips the call to resizeStack() when
  the PiP mode is set to STATE_NO_PIP.

Bug: 34692144
Test: Try and launch Fugu
Change-Id: Ic539f4431c2f94e7c10520c383fa49157d1d0631
 2017-01-25 21:03:59 +00:00
George Burgess IV
85895792f0 Merge "Fix a use-of-uninitialized-value warning." am: 500cf67206 am: f77f2cb3e7 am: 0c6283e396 
am: 858852a6dc

Change-Id: Ib874408eb77d265a9e939679bd2c5459217063e8
 2017-01-25 20:23:58 +00:00
Shuzhen Wang
e56e606f82 Camera2: Handle (0, 0) size for deferred OutputConfiguration 
We need to handle below sequence of events:
1. OutputConfiguration(Size(0, 0), klass)
2. addSurface(surface)
3. createCameraCaptureSession

In this case, allow the addSurface() to succeed.

Test: camera works in keep/hangouts/contacts
Bug: 34697112
Change-Id: I726c60cce9a11c69b050aad47f4ed4a0a7a0870e
 2017-01-25 12:22:01 -08:00
Mark Rathjen
8bd8564a18 Merge "Resolve Android security comments for Android ID migration." 2017-01-25 20:20:29 +00:00
TreeHugger Robot
a92c180107 Merge "Also parse "1" as true for ContentValues#getAsBoolean" 2017-01-25 20:19:11 +00:00
George Burgess IV
858852a6dc Merge "Fix a use-of-uninitialized-value warning." am: 500cf67206 am: f77f2cb3e7 
am: 0c6283e396

Change-Id: Ife5d9444f9036c16540bd7bf7a1c0e17cf296df5
 2017-01-25 20:19:05 +00:00
George Burgess IV
0c6283e396 Merge "Fix a use-of-uninitialized-value warning." am: 500cf67206 
am: f77f2cb3e7

Change-Id: I44e23c5689b51ae002a8db71a537ab97d3f31121
 2017-01-25 20:14:00 +00:00
Android Build Merger (Role)
73c945de33 Merge "Merge "nfc: Make NDEF validation stricter" am: f3a6269fed am: e6cb2aa614 am: 40c14a83d0 am: deac669a53" 2017-01-25 20:13:03 +00:00
TreeHugger Robot
260dedceda Merge "[clipboard] Clipboard sharing" 2017-01-25 20:12:17 +00:00
Ruchi Kandoi
2a13fbae73 Merge "nfc: Make NDEF validation stricter" am: f3a6269fed am: e6cb2aa614 am: 40c14a83d0 
am: deac669a53

Change-Id: I208e9c5d6fbbfa9f3a6c0d43f38fcacc040ccb92
 2017-01-25 20:12:06 +00:00
George Burgess IV
f77f2cb3e7 Merge "Fix a use-of-uninitialized-value warning." 
am: 500cf67206

Change-Id: I8b171a90696e09c42a1506255bc4c0056f69f35c
 2017-01-25 20:09:26 +00:00
Ruchi Kandoi
deac669a53 Merge "nfc: Make NDEF validation stricter" am: f3a6269fed am: e6cb2aa614 
am: 40c14a83d0

Change-Id: I7ef55eddac20d58e9184056e85c9b49e733fd38d
 2017-01-25 20:07:23 +00:00
Ruchi Kandoi
40c14a83d0 Merge "nfc: Make NDEF validation stricter" am: f3a6269fed 
am: e6cb2aa614

Change-Id: Ib069a18f16850d419b6c10c3b80e80115d9d8fc8
 2017-01-25 20:03:00 +00:00
Treehugger Robot
500cf67206 Merge "Fix a use-of-uninitialized-value warning." 2017-01-25 20:01:34 +00:00
Ruchi Kandoi
e6cb2aa614 Merge "nfc: Make NDEF validation stricter" 
am: f3a6269fed

Change-Id: If69e586c81e5926c0795af3689de67b260891eaa
 2017-01-25 19:59:16 +00:00
Rubin Xu
1b60614ae9 Merge "Fix build breakage" 2017-01-25 19:56:40 +00:00
Jason Monk
d5e96800d2 Merge "Fix up the tests (yet again)" 2017-01-25 19:55:37 +00:00
Treehugger Robot
f3a6269fed Merge "nfc: Make NDEF validation stricter" 2017-01-25 19:54:01 +00:00
Selim Cinek
6825542381 Merge "Started visual hierarchy for min priority notifications" 2017-01-25 19:53:49 +00:00
TreeHugger Robot
000f7cd646 Merge "Initial IME integration." 2017-01-25 19:44:33 +00:00
TreeHugger Robot
13fd7f1899 Merge "Fix issue with PiP hiding when dragging divider." 2017-01-25 19:31:56 +00:00
TreeHugger Robot
79e5cf1cc7 Merge "Fixing issue with wrong bounds being reported in StackInfo." 2017-01-25 19:29:00 +00:00
TreeHugger Robot
142cbdd474 Merge "Expose intents for launching channel settings." 2017-01-25 19:20:21 +00:00
TreeHugger Robot
fbcb01cde7 Merge "Move theme out of tuner and into display settings" 2017-01-25 19:17:22 +00:00
Rubin Xu
06c39bc07f Fix build breakage 
Implement new methods in MockStorageManager

Test: it builds
Change-Id: Icdd49a1b6709ab63a8b00328b9da8120482bbc8a
 2017-01-25 19:13:27 +00:00
Evan Rosky
df7f283520 Merge "Changed cluster kb navigation shortcut to meta+[shift]+tab" 2017-01-25 19:04:22 +00:00
Robert Sesek
037e758db5 Merge changes I100dac6b,Ibbecac7e 
* changes:
  Enable multiprocess WebView by default.
  Prepare to enable multiprocess by default.
 2017-01-25 19:00:44 +00:00
TreeHugger Robot
b93ecbae57 Merge "MessagingStyle: Add historic messages" 2017-01-25 18:47:20 +00:00
Rubin Xu
e7beedff6e Merge "Add unit tests for LockSettingsService" 2017-01-25 18:38:31 +00:00
Christine Franks
b3e3100489 Merge "Merge "Require password to FR in carrier demo mode"" 2017-01-25 18:38:03 +00:00
Andre Eisenbach
b9059986d7 Merge "Bluetooth: fix indentation, formatting in dumpsys" am: 35c715332f am: 36ce9b7ea0 am: 8b1d096e58 
am: c39388d605

Change-Id: I51a9cec90c232b6f16e50f9a962bf2795bbf725b
 2017-01-25 18:28:55 +00:00
Andre Eisenbach
c39388d605 Merge "Bluetooth: fix indentation, formatting in dumpsys" am: 35c715332f am: 36ce9b7ea0 
am: 8b1d096e58

Change-Id: I4fd28828d5ed8ec2a3e93b6f8ab074dccdcb30e2
 2017-01-25 18:23:50 +00:00
Ruchi Kandoi
2ed0b48abb nfc: Make NDEF validation stricter 
- Check if the MB is not set for any record apart from the first one.
- If the record is chunked, first record must contain the type

Bug: 20722275
Test: Manual; write raw NDEF messages to a tag
Change-Id: I3e73fc5163bbcd8a1f23417e98f57b665f4f1fad
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
 2017-01-25 18:21:28 +00:00
Andre Eisenbach
8b1d096e58 Merge "Bluetooth: fix indentation, formatting in dumpsys" am: 35c715332f 
am: 36ce9b7ea0

Change-Id: I3381764156fadf755d679b9a3c9356fc90e50fd2
 2017-01-25 18:19:51 +00:00
Andre Eisenbach
36ce9b7ea0 Merge "Bluetooth: fix indentation, formatting in dumpsys" 
am: 35c715332f

Change-Id: I7c603ab9f50921afb45e3d7181541260d8939089
 2017-01-25 18:16:27 +00:00
Grigory Dzhavadyan
63408e643a [clipboard] Clipboard sharing 
The fix has been submitted to the emulator: https://android-review.googlesource.com/#/c/298922/

Resolved merge conflict with 1611052.

Change-Id: Ic1e9a3d2dfc3c933d83482d92bfb4da1fee4ebbe
 2017-01-25 10:16:06 -08:00
Hangyu Kuang
6ab568b4ba Merge "media: Relax the filedescriptor check to allow write-only mode." 2017-01-25 18:07:26 +00:00
Hongming Jin
ea694adb68 Merge "Test: AccountManagerService APCT test." 2017-01-25 18:06:31 +00:00
Andre Eisenbach
35c715332f Merge "Bluetooth: fix indentation, formatting in dumpsys" 2017-01-25 18:05:11 +00:00
Marie Janssen
a95924da57 Bluetooth: fix indentation, formatting in dumpsys 
Before
======
Enable log:
01-17 09:43:18   Enabled  by com.android.systemui
01-18 07:13:10  Disabled  by com.andorid.systemui

1 BLE Apps registered:
com.google.android.gms

After
=====
Enable log:
  02-06 07:49:07   Enabled  by system boot
  02-06 07:49:35  Disabled  by com.andorid.systemui

1 BLE App registered:
  com.google.android.gms

Test: run bugreport, see differences in dumpsys
Change-Id: I6086f7f97c1fcbdb860d70d9516fd5bf630a9f5e
 2017-01-25 18:02:26 +00:00
Edman Anjos
452efaac32 Merge changes I50d2903e,Ieb347ce3 
* changes:
  Add DPMS delegation scopes.
  Add block uninstall delegation in DPMS.
 2017-01-25 18:00:03 +00:00
Hangyu Kuang
82d2ea4a4f media: Relax the filedescriptor check to allow write-only mode. 
Test: Use the MMS app to record video.
Bug: 34594319
Change-Id: I0680c48f5f240e2b18264dbf952622ad0497130b
 2017-01-25 17:58:06 +00:00
Winson Chung
b00dc5ebee Fixing issue with wrong bounds being reported in StackInfo. 
Bug: 34696293
Test: Launch overview from any app
Change-Id: I99a33b3abc9aea54ff12bf2d37a54aeefcdd535e
 2017-01-25 09:44:25 -08:00
Julia Reynolds
9ba0c613a5 Expose intents for launching channel settings. 
Test: manual
Change-Id: I86e12b0ed6b60660b9f6bd1015c186897418560e
 2017-01-25 12:43:13 -05:00
Jason Monk
524fb4025e Move theme out of tuner and into display settings 
Change-Id: Id939a8a34e92c6190c59317155238697861a65e5
Fixes: 34682466
Test: Manual
 2017-01-25 12:32:07 -05:00
TreeHugger Robot
1597e0540d Merge "Tron logging - Fix isValidValue to match its name, allow nulls." 2017-01-25 17:25:20 +00:00