Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
243,162 Commits 3 Branches 0 Tags
6818cd554050152821175eb3d429275e6cc3267d
Commit Graph

243162 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve McKay
6818cd5540 Merge "Finish selection mode after copyto and share..." into nyc-dev 
am: 94e3b80d5b

* commit '94e3b80d5b3fd88f6656cb5cae813c4e63faebff':
  Finish selection mode after copyto and share...

Change-Id: If4a47f84569e1cb58eb4d0f3c8e209e78177e615
 2016-05-04 21:37:39 +00:00
Amit Mahajan
8f04f5f3ba Merge "Marking @SystemApi permissions @hide too." into nyc-dev 
am: 441da79d8a

* commit '441da79d8aa7b873f23227d10ecd425671b85506':
  Marking @SystemApi permissions @hide too.

Change-Id: Ic4516f40e3845b5bc4863a5b52039c2c770d68f4
 2016-05-04 21:37:29 +00:00
Makoto Onuki
5b9d876ef5 Merge "ShortcutManaegr: bug fixes" into nyc-mr1-dev 2016-05-04 21:28:17 +00:00
TreeHugger Robot
94e3b80d5b Merge "Finish selection mode after copyto and share..." into nyc-dev 2016-05-04 20:58:39 +00:00
TreeHugger Robot
441da79d8a Merge "Marking @SystemApi permissions @hide too." into nyc-dev 2016-05-04 20:50:16 +00:00
Android Build Merger (Role)
75179ada54 Merge "Merge "Make sure to pause activity before stopping" into nyc-dev am: 5f81a3f84c" into nyc-mr1-dev 2016-05-04 20:49:17 +00:00
Wale Ogunwale
849c424293 Merge "Make sure to pause activity before stopping" into nyc-dev 
am: 5f81a3f84c

* commit '5f81a3f84c97999f9eb19291c7b4f67ad8576c7c':
  Make sure to pause activity before stopping

Change-Id: If6888d7b1a36594045927fa1ab33c82c2899206f
 2016-05-04 20:48:51 +00:00
Hyunyoung Song
2cbf71a0be Merge "Add Shortcut API to Settings (1/2) b/28298258" into nyc-mr1-dev 2016-05-04 20:43:09 +00:00
David Friedman
d6726eea7e Docs: Adds fugu to list of Vulkan-supported devices. am: 0677d4b715 am: 60e5bc30bb am: 0de8689243 am: 21a55dc82c 
am: 6954edf67c

* commit '6954edf67c9e4f9717d42ddd3b424dd3164062fd':
  Docs: Adds fugu to list of Vulkan-supported devices.

Change-Id: I81493f743cc9452469d93eeee81e2b24bca813de
 2016-05-04 20:30:26 +00:00
TreeHugger Robot
5f81a3f84c Merge "Make sure to pause activity before stopping" into nyc-dev 2016-05-04 20:28:51 +00:00
Jason Monk
76ecc4a166 Merge "Fix QS header size after landscape inflation" into nyc-dev 
am: 9ff0083647

* commit '9ff00836473dca5e91bccf109902246458b44adc':
  Fix QS header size after landscape inflation

Change-Id: I97ba6feebc4282e4dcef71e805cf06c9bd2eba55
 2016-05-04 20:22:16 +00:00
David Friedman
6954edf67c Docs: Adds fugu to list of Vulkan-supported devices. am: 0677d4b715 am: 60e5bc30bb am: 0de8689243 
am: 21a55dc82c

* commit '21a55dc82c24ffb8c0d77c1980fe5acc1400001d':
  Docs: Adds fugu to list of Vulkan-supported devices.

Change-Id: I372454e0f336d4ae4703ca296e102447db247d61
 2016-05-04 20:21:53 +00:00
David Friedman
21a55dc82c Docs: Adds fugu to list of Vulkan-supported devices. am: 0677d4b715 am: 60e5bc30bb 
am: 0de8689243

* commit '0de8689243ae0d48744b7c1584670a10febafe32':
  Docs: Adds fugu to list of Vulkan-supported devices.

Change-Id: If89adfe3f280815f26cec7048e50e4d8c9ad7b7d
 2016-05-04 20:13:37 +00:00
Jason Monk
9ff0083647 Merge "Fix QS header size after landscape inflation" into nyc-dev 2016-05-04 20:11:56 +00:00
Jason Monk
cd4e382bd0 Fix QS header size after landscape inflation 
Change-Id: Ic735462d0af2437ed9e74a960ff0dc12126c30f2
Fixes: 28306834
 2016-05-04 16:08:08 -04:00
David Friedman
0de8689243 Docs: Adds fugu to list of Vulkan-supported devices. am: 0677d4b715 
am: 60e5bc30bb

* commit '60e5bc30bbb41f25836a8bbd2a04bc2eab4b7f8c':
  Docs: Adds fugu to list of Vulkan-supported devices.

Change-Id: Iab5e6c2b992c241de667476ce74b2bc6a2d4dac9
 2016-05-04 20:04:06 +00:00
Makoto Onuki
8569452603 ShortcutManaegr: bug fixes 
Fixes 28590035
Fixes 28586105

Change-Id: Ia11d29e4996ad5b47b279a3c04d9586695cdc0a5
 2016-05-04 13:00:41 -07:00
David Friedman
60e5bc30bb Docs: Adds fugu to list of Vulkan-supported devices. 
am: 0677d4b715

* commit '0677d4b7153327fef6b33c90c5bf61f756c1bea3':
  Docs: Adds fugu to list of Vulkan-supported devices.

Change-Id: Ida6a6972ff32917eb9367871d6ea0766cc37d05e
 2016-05-04 20:00:08 +00:00
Philip P. Moltmann
e87fdd9c16 Merge "Add HP and Mopria print recommendation service" into nyc-dev 
am: 9e5d4e078a

* commit '9e5d4e078a93f187f6ec612734dded61372636fb':
  Add HP and Mopria print recommendation service

Change-Id: I6dd1b1dd1787282ad67d7bdd4ffbce070e6de860
 2016-05-04 19:29:18 +00:00
Philip P. Moltmann
9e5d4e078a Merge "Add HP and Mopria print recommendation service" into nyc-dev 2016-05-04 19:22:58 +00:00
David Friedman
0677d4b715 Docs: Adds fugu to list of Vulkan-supported devices. 
Change-Id: Ic61f5e20c6c950ef7333e56757a782f67bae8da1
 2016-05-04 12:14:08 -07:00
Robin Lee
78d0888e8c Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev 
am: 7ec93a1ee2

* commit '7ec93a1ee2d381fdcd3be271712e4179ddbf9829':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: I7e3f9edd802dfe7c98abf79dcf8f6fa14ce39c01
 2016-05-04 18:52:53 +00:00
Hyunyoung Song
be6c44823b Add Shortcut API to Settings (1/2) 
b/28298258

Initial CL to simply add first time shortcuts in the beginning.

Change-Id: Ib64e3cf1b17979da1548c168cd551ae125289132
 2016-05-04 18:51:30 +00:00
Wale Ogunwale
5dc6d6551e Make sure to pause activity before stopping 
In some cases it is possible for activity manager to request
a resumed activity to stop when it's visibility changes. This
is a valid transition, however we need to make sure to pause
the activity on the client side before stopping it so lifecycle
transition works as expected.

Bug: 28574036
Change-Id: I759b38bbd1c9c3bb0475759bcb638d8223fa504d
 2016-05-04 11:46:29 -07:00
Robin Lee
31b3676cce Merge changes I31d5260d,Ied92f558 into nyc-dev 
am: a5e6553917

* commit 'a5e6553917359bb662c8f2788feb3d617803d406':
  Start VPN as early as possible during startup
  Split network agent created state from connected state

Change-Id: I5fedffbf3d8f2826b94ccd2f3e1ba1f5563c43af
 2016-05-04 18:46:19 +00:00
Andrew Solovay
8b6b360efc Merge "docs: Renaming /go/ top-level directory to /topic/" into mnc-mr-docs am: 6006856b24 am: 5c197a1513 am: 99dfd4c92f 
am: a75f01557c

* commit 'a75f01557cb3299de69ae856a06e824535de6e39':
  docs: Renaming /go/ top-level directory to /topic/

Change-Id: I278652c5762e5c0e1fa9aafd52986f36a050e504
 2016-05-04 18:40:54 +00:00
Robin Lee
7ec93a1ee2 Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev 2016-05-04 18:38:30 +00:00
Robin Lee
a5e6553917 Merge changes I31d5260d,Ied92f558 into nyc-dev 
* changes:
  Start VPN as early as possible during startup
  Split network agent created state from connected state
 2016-05-04 18:35:19 +00:00
Andrew Solovay
a75f01557c Merge "docs: Renaming /go/ top-level directory to /topic/" into mnc-mr-docs am: 6006856b24 am: 5c197a1513 
am: 99dfd4c92f

* commit '99dfd4c92f13f9fe024fe995261bcfdd8bd61295':
  docs: Renaming /go/ top-level directory to /topic/

Change-Id: Ie817cd75f56e9bc8d5080711d0cb7de6887541aa
 2016-05-04 18:30:17 +00:00
Andrew Solovay
99dfd4c92f Merge "docs: Renaming /go/ top-level directory to /topic/" into mnc-mr-docs am: 6006856b24 
am: 5c197a1513

* commit '5c197a1513a1a3b181977c6425a0f542d770a1bc':
  docs: Renaming /go/ top-level directory to /topic/

Change-Id: I1a49367d42f2d16e0b3c9c9f41bb844a00052490
 2016-05-04 18:23:07 +00:00
Abhijith Shastry
c7e32aba8d Merge "Update BlockedNumberContract documentation." into nyc-dev 
am: 9a2384a7a6

* commit '9a2384a7a6ad4ff630f125e844f7b202ec3cc649':
  Update BlockedNumberContract documentation.

Change-Id: I05aee9d3367e37f783eae34ec33025da463a8306
 2016-05-04 18:22:14 +00:00
Abhijith Shastry
9a2384a7a6 Merge "Update BlockedNumberContract documentation." into nyc-dev 2016-05-04 18:14:38 +00:00
Andrew Solovay
5c197a1513 Merge "docs: Renaming /go/ top-level directory to /topic/" into mnc-mr-docs 
am: 6006856b24

* commit '6006856b24335473e71a58d3bf45d49c57ea6055':
  docs: Renaming /go/ top-level directory to /topic/

Change-Id: I6401fd1a31ec8c064387b9a7e49aaf52a76b80f1
 2016-05-04 18:14:32 +00:00
Renat Aksitov
032c1a9299 Merge "Voice Messaging Intent API." into nyc-dev 
am: d516e30b91

* commit 'd516e30b915ffabd0c09f5726d44c1f51fdeceec':
  Voice Messaging Intent API.

Change-Id: I3c63645c1b181e088e8d7b8280a55e875682c4da
 2016-05-04 18:08:43 +00:00
Andrew Solovay
6006856b24 Merge "docs: Renaming /go/ top-level directory to /topic/" into mnc-mr-docs 2016-05-04 18:07:10 +00:00
Renat Aksitov
d516e30b91 Merge "Voice Messaging Intent API." into nyc-dev 2016-05-04 18:02:47 +00:00
Dongwon Kang
6d03a1335b Merge "Revert "TIF: add signal detection feature for HW inputs"" into nyc-dev 
am: b69b5b4a6d

* commit 'b69b5b4a6ddf14ad41de93a46095466858fbdec2':
  Revert "TIF: add signal detection feature for HW inputs"

Change-Id: Ib5fd0a8a7133063b14af4a404ea14089bab0c495
 2016-05-04 17:42:47 +00:00
Dongwon Kang
b69b5b4a6d Merge "Revert "TIF: add signal detection feature for HW inputs"" into nyc-dev 2016-05-04 17:33:54 +00:00
Sid Soundararajan
6c0b20446a Merge "Add a null check for the thumbnail image for transition" into nyc-dev 
am: 2ff157c027

* commit '2ff157c027cb3eb5eddefa39617ec49aeb75a139':
  Add a null check for the thumbnail image for transition

Change-Id: I149beb8615e78677e25b07cbf137152165ae38b9
 2016-05-04 17:30:27 +00:00
Julia Reynolds
25e83b4065 Merge "Uncheck unselected radio buttons." into nyc-dev 
am: 69e0d82994

* commit '69e0d8299460afeea1d33619b341937914a42839':
  Uncheck unselected radio buttons.

Change-Id: Ide0a1270da222aadf343829f54074636e7823fc5
 2016-05-04 17:30:24 +00:00
Vladislav Kaznacheev
423c902258 Merge "Fix ClipData JavaDoc and behavior that contradicts JavaDoc" into nyc-dev 
am: 221c6e6db7

* commit '221c6e6db77c99351d65db29c432caa077613124':
  Fix ClipData JavaDoc and behavior that contradicts JavaDoc

Change-Id: Iddb5bc03bdaeec04336a86d90b9243914ba6c461
 2016-05-04 17:30:21 +00:00
Pavel Zhamaitsiak
54b3111fca Merge "Fix race condition in MetricsLoggerService" into nyc-dev 
am: be3e539ff7

* commit 'be3e539ff7b26d497f930fb2faf761e94fa99297':
  Fix race condition in MetricsLoggerService

Change-Id: I6c5b3d2b4889bef57ff169199081bdb79b8117e8
 2016-05-04 17:30:17 +00:00
Sid Soundararajan
2ff157c027 Merge "Add a null check for the thumbnail image for transition" into nyc-dev 2016-05-04 17:14:19 +00:00
TreeHugger Robot
69e0d82994 Merge "Uncheck unselected radio buttons." into nyc-dev 2016-05-04 17:09:52 +00:00
TreeHugger Robot
221c6e6db7 Merge "Fix ClipData JavaDoc and behavior that contradicts JavaDoc" into nyc-dev 2016-05-04 17:07:13 +00:00
Steve McKay
1d8b98bdd3 Merge "Disable share when dirs selected." into nyc-dev 
am: 3fff306827

* commit '3fff306827c6fe998f8569d71ea18da597eb5a85':
  Disable share when dirs selected.

Change-Id: I2dbe0e2081580b5096a60657b5dc35536dc8f873
 2016-05-04 17:05:28 +00:00
Vladislav Kaznacheev
9d17528e7c Merge "Collect mime type data correctly for all URIs added to ClipData" into nyc-dev 
am: e06ef946f4

* commit 'e06ef946f4f86e11f9a8ed5abe216ef7b76aebf0':
  Collect mime type data correctly for all URIs added to ClipData

Change-Id: I6f50e3c880cf7ae6f67f6571cdabe6d68cc1f7c1
 2016-05-04 17:05:25 +00:00
Pavel Zhamaitsiak
be3e539ff7 Merge "Fix race condition in MetricsLoggerService" into nyc-dev 2016-05-04 17:02:18 +00:00
Steve McKay
3fff306827 Merge "Disable share when dirs selected." into nyc-dev 2016-05-04 16:46:30 +00:00
Robin Lee
323f29df58 Start VPN as early as possible during startup 
- Switch from USER_STARTING to USER_STARTED which is the foreground
  version of the broadcast

- Set the new VPN network as CONNECTING initially to avoid spamming
  apps with useless notifications ahead of the network being fully
  available

Bug: 26694104
Fix: 28335277
Change-Id: I31d5260dda62ff440c31c44eb0aa5c891e2717e5
 2016-05-04 17:46:10 +01:00