Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
256,777 Commits 3 Branches 0 Tags
f9d60d034e0b78a33a401aaa1741bf25e8b676ec
Commit Graph

65796 Commits

Author SHA1 Message Date
Ruben Brunk
f9d60d034e Merge "Update VR API docs." into nyc-dev am: 01d232988a am: 2d1a1a4521 
am: d12543c983

* commit 'd12543c9836ebae9f82045ef626d09da2654363f':
  Update VR API docs.

Change-Id: Ic26060e0684b983767b399490e8d47c0420a1c11
 2016-05-05 00:49:47 +00:00
Chong Zhang
43faf5c5cb Merge "Debug traces to facilitate screen timeout debugging" into nyc-dev am: 6afe594461 am: 242eadabea 
am: c4c65f211e

* commit 'c4c65f211e3c40ee00dd0be796fe0d0a4080378b':
  Debug traces to facilitate screen timeout debugging

Change-Id: Id698967d9d1d11c2d086584b60fa1fe3766df091
 2016-05-05 00:34:15 +00:00
Dianne Hackborn
4e1fa3c476 resolve merge conflicts of a14aac9 to master 
Change-Id: If92c42a9e6fbc3cccd24fa2677f0e4c34d65c923
 2016-05-04 16:53:38 -07:00
Ruben Brunk
d12543c983 Merge "Update VR API docs." into nyc-dev am: 01d232988a 
am: 2d1a1a4521

* commit '2d1a1a45219d4946527c284eb801a1c9e966966c':
  Update VR API docs.

Change-Id: I6f3c0348d98db2d7c8f6e3d757ac77f02d4e179f
 2016-05-04 23:44:04 +00:00
Ruben Brunk
2d1a1a4521 Merge "Update VR API docs." into nyc-dev 
am: 01d232988a

* commit '01d232988a69dfdee7f90cebf560686e458849e4':
  Update VR API docs.

Change-Id: I8e9d63e8ff6cab67b6c0def4f09a05fb03a23ecd
 2016-05-04 23:41:38 +00:00
Ruben Brunk
01d232988a Merge "Update VR API docs." into nyc-dev 2016-05-04 23:35:44 +00:00
Chong Zhang
c4c65f211e Merge "Debug traces to facilitate screen timeout debugging" into nyc-dev am: 6afe594461 
am: 242eadabea

* commit '242eadabeabbd4413a0b92e6176d3fa1fbec1389':
  Debug traces to facilitate screen timeout debugging

Change-Id: I905f70f191f02ced4feed2a4e50366cca0240251
 2016-05-04 22:57:56 +00:00
Dianne Hackborn
a14aac9a2d Merge "Maybe fix issue #28457907: Pebble app crash + reboot" into nyc-dev am: 6eb119c7cb 
am: 5081e36897

* commit '5081e368978e00353c5968f0f7656ca28e963b4a':
  Maybe fix issue #28457907: Pebble app crash + reboot

Change-Id: I0db52017c4a351341b0823381e7b85b0c641a16d
 2016-05-04 22:57:53 +00:00
Chris Craik
0af20e8385 Merge "Fix View leakage from mPreSortedChildren" into nyc-dev am: 4e34cd0537 am: 2f66d0a849 
am: 115f86846b

* commit '115f86846b74ea45e15f9bc60b9edfee9b13f3c2':
  Fix View leakage from mPreSortedChildren

Change-Id: I77778638af8ae77bfe423c8e617932df606b4268
 2016-05-04 22:55:37 +00:00
Chong Zhang
242eadabea Merge "Debug traces to facilitate screen timeout debugging" into nyc-dev 
am: 6afe594461

* commit '6afe594461930e83cbf5ecf181bf43fcba0060dd':
  Debug traces to facilitate screen timeout debugging

Change-Id: I89dad5e66db460af83deac679f2f81bef34d0e69
 2016-05-04 22:52:55 +00:00
Dianne Hackborn
5081e36897 Merge "Maybe fix issue #28457907: Pebble app crash + reboot" into nyc-dev 
am: 6eb119c7cb

* commit '6eb119c7cb665211d4848c26a3c72d0835e34fed':
  Maybe fix issue #28457907: Pebble app crash + reboot

Change-Id: I9030b23fc42bc9a13a3a7cb0f1b92142bb6ea546
 2016-05-04 22:52:52 +00:00
Chong Zhang
6afe594461 Merge "Debug traces to facilitate screen timeout debugging" into nyc-dev 2016-05-04 22:50:11 +00:00
Dianne Hackborn
6eb119c7cb Merge "Maybe fix issue #28457907: Pebble app crash + reboot" into nyc-dev 2016-05-04 22:49:59 +00:00
Chris Craik
115f86846b Merge "Fix View leakage from mPreSortedChildren" into nyc-dev am: 4e34cd0537 
am: 2f66d0a849

* commit '2f66d0a8497d1f1247a7f293b2b681cef1f9057f':
  Fix View leakage from mPreSortedChildren

Change-Id: I317fb1f6d5b0e145601649cd0e43730342a0e80d
 2016-05-04 22:33:13 +00:00
Chet Haase
426e872d35 Merge "Force second measure pass when there is a configuration change" into nyc-dev am: c381c4e8e7 am: 26a4627102 
am: c96a245e1a

* commit 'c96a245e1a771a2a9b020c14fee90aa60b832318':
  Force second measure pass when there is a configuration change

Change-Id: Ic81ffd3b7ea102f8e4e72a3a6c5d779dfb1b009e
 2016-05-04 22:31:34 +00:00
Yohei Yukawa
f08b176da4 Merge "Fix a behavior change in "Show software keyboard"." into nyc-dev am: 68c1e1935d am: 8e0e5e8a88 
am: 1cdcbcbc8f

* commit '1cdcbcbc8f065e062c1cb9d914f944e8b1fbbb27':
  Fix a behavior change in "Show software keyboard".

Change-Id: I6a0a06bbbe6d23c9398967d7cb4eb89f90eaae9d
 2016-05-04 22:31:11 +00:00
Chris Craik
2f66d0a849 Merge "Fix View leakage from mPreSortedChildren" into nyc-dev 
am: 4e34cd0537

* commit '4e34cd05379d1e96a5ca8081b3e3fa3b1a1cc534':
  Fix View leakage from mPreSortedChildren

Change-Id: Idd17fa7d0cb1bfbca1725525d85e4068a234c8b6
 2016-05-04 22:30:30 +00:00
TreeHugger Robot
4e34cd0537 Merge "Fix View leakage from mPreSortedChildren" into nyc-dev 2016-05-04 22:23:26 +00:00
Makoto Onuki
0e86dfb802 Merge "Merge "ShortcutManaegr: bug fixes" into nyc-mr1-dev am: 5b9d876ef5" into nyc-mr1-dev-plus-aosp 
am: ccf9c83765

* commit 'ccf9c8376595ddbed64cedd236349cb99a2e8708':
  ShortcutManaegr: bug fixes

Change-Id: I2aeb67ca5f46165b63e685c90d8acf6cb909b351
 2016-05-04 22:09:57 +00:00
Wale Ogunwale
d622b932fa Merge "Merge "Merge "Make sure to pause activity before stopping" into nyc-dev am: 5f81a3f84c" into nyc-mr1-dev am: 75179ada54" into nyc-mr1-dev-plus-aosp 
am: c2bef7c6e2

* commit 'c2bef7c6e2eade011a73db1abd4acf2ab8b3aca7':
  Make sure to pause activity before stopping

Change-Id: I4ae725d3d331cf834da1456d6aebcc702e4ad8d6
 2016-05-04 22:09:41 +00:00
Chong Zhang
4ffc318012 Debug traces to facilitate screen timeout debugging 
bug: 27522448
Change-Id: I4d51be316e4aedecffb7001126849d7c6136d517
 2016-05-04 15:09:01 -07:00
Robin Lee
4632c0c9a8 Merge "Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 7ec93a1ee2 am: 78d0888e8c" into nyc-mr1-dev-plus-aosp 
am: 062a28b6a4

* commit '062a28b6a403a48d6f5f88e109a899c9c60581c1':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: I9ebd6221451ee10649a1f340031d62c6483832f1
 2016-05-04 22:04:40 +00:00
Abhijith Shastry
00dc230a09 Merge "Merge "Update BlockedNumberContract documentation." into nyc-dev am: 9a2384a7a6 am: c7e32aba8d" into nyc-mr1-dev-plus-aosp 
am: d843f04cd3

* commit 'd843f04cd3b9a3f68cae9c15c6313b8f5099893e':
  Update BlockedNumberContract documentation.

Change-Id: I5e338921fd7f82bbd8e84f31088329cbc17737a8
 2016-05-04 22:01:52 +00:00
Renat Aksitov
c1b6e2db3f Merge "Merge "Voice Messaging Intent API." into nyc-dev am: d516e30b91 am: 032c1a9299" into nyc-mr1-dev-plus-aosp 
am: f473ee9ebc

* commit 'f473ee9ebc992737ef226ae78b46b6e9fef3563f':
  Voice Messaging Intent API.

Change-Id: I8017d7b1f39cc7c21feb98f4a469dd5c5de77cb4
 2016-05-04 21:59:57 +00:00
Chet Haase
c96a245e1a Merge "Force second measure pass when there is a configuration change" into nyc-dev am: c381c4e8e7 
am: 26a4627102

* commit '26a4627102e466e3e7831e84e459d95f0ff7778a':
  Force second measure pass when there is a configuration change

Change-Id: Icbc841e1641bbe2fabac589a3c60fc3404cda0c2
 2016-05-04 21:55:13 +00:00
Yohei Yukawa
1cdcbcbc8f Merge "Fix a behavior change in "Show software keyboard"." into nyc-dev am: 68c1e1935d 
am: 8e0e5e8a88

* commit '8e0e5e8a8884d6536a3ee7511411e7d78d8ed265':
  Fix a behavior change in "Show software keyboard".

Change-Id: I86f131edcaa8ec069848830641a546b80e755f65
 2016-05-04 21:55:10 +00:00
Vladislav Kaznacheev
9f842251b0 Merge "Fix ClipData JavaDoc and behavior that contradicts JavaDoc" into nyc-dev am: 221c6e6db7 am: 423c902258 
am: 040646bb08

* commit '040646bb084632713436ee6a2a0b9de99d4eee8d':
  Fix ClipData JavaDoc and behavior that contradicts JavaDoc

Change-Id: Ifa6973f839dd2c8f4bac8befd6ad445f68a462d9
 2016-05-04 21:54:46 +00:00
Chet Haase
512c406be9 Merge "Force second measure pass when there is a configuration change" into nyc-dev 
am: c381c4e8e7

* commit 'c381c4e8e7b7dfc2aed0a662bf56e3d6e512df5d':
  Force second measure pass when there is a configuration change

Change-Id: I2586fe3605461b2e6e4d9678afd6436078dab21c
 2016-05-04 21:51:38 +00:00
Chet Haase
26a4627102 Merge "Force second measure pass when there is a configuration change" into nyc-dev 
am: c381c4e8e7

* commit 'c381c4e8e7b7dfc2aed0a662bf56e3d6e512df5d':
  Force second measure pass when there is a configuration change

Change-Id: I34afe7f97bc141bc4981643f61518d4bcbf29ba7
 2016-05-04 21:51:33 +00:00
Chet Haase
c381c4e8e7 Merge "Force second measure pass when there is a configuration change" into nyc-dev 2016-05-04 21:49:11 +00:00
Yohei Yukawa
3af9c01322 Merge "Fix a behavior change in "Show software keyboard"." into nyc-dev 
am: 68c1e1935d

* commit '68c1e1935d5c3de080513a31b305eef722ee380c':
  Fix a behavior change in "Show software keyboard".

Change-Id: I9b2f1e2ac8c595c3b19daab8b4ccb763ab700203
 2016-05-04 21:42:45 +00:00
Yohei Yukawa
8e0e5e8a88 Merge "Fix a behavior change in "Show software keyboard"." into nyc-dev 
am: 68c1e1935d

* commit '68c1e1935d5c3de080513a31b305eef722ee380c':
  Fix a behavior change in "Show software keyboard".

Change-Id: Ia7069eb539a9b809bc3e14514bee16149c9151c8
 2016-05-04 21:42:43 +00:00
Makoto Onuki
bdfb3aada3 Merge "ShortcutManaegr: bug fixes" into nyc-mr1-dev 
am: 5b9d876ef5

* commit '5b9d876ef5bf4613d9ef89148c1ab021c473c02e':
  ShortcutManaegr: bug fixes

Change-Id: I3823ba8a62a853d0ee49ec7626778b8fa09adbab
 2016-05-04 21:42:26 +00:00
Wale Ogunwale
8fa700675d Merge "Merge "Make sure to pause activity before stopping" into nyc-dev am: 5f81a3f84c" into nyc-mr1-dev 
am: 75179ada54

* commit '75179ada546393cb8929ca9703d39e1151d95ed9':
  Make sure to pause activity before stopping

Change-Id: I5020b92b2edbe0ff749d019fbeb81abf2ae49fe9
 2016-05-04 21:42:18 +00:00
Robin Lee
d319d26279 Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev am: 7ec93a1ee2 
am: 78d0888e8c

* commit '78d0888e8c9358681a6f564b30b2cc35bbe72a45':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: I7ec39775980ec839aa814cf284ea352789aa788f
 2016-05-04 21:41:23 +00:00
Abhijith Shastry
0734be2f3e Merge "Update BlockedNumberContract documentation." into nyc-dev am: 9a2384a7a6 
am: c7e32aba8d

* commit 'c7e32aba8d9c24040da00d6ec1e599a14c4c4f8d':
  Update BlockedNumberContract documentation.

Change-Id: I136799fbedecbea19a005fe4d47b2e41be98cffb
 2016-05-04 21:40:04 +00:00
Renat Aksitov
09f9bc73f4 Merge "Voice Messaging Intent API." into nyc-dev am: d516e30b91 
am: 032c1a9299

* commit '032c1a92994e251336114c6b600040bf86991772':
  Voice Messaging Intent API.

Change-Id: Iad7c03099fae00d3c1c2bea0f8100608af33851d
 2016-05-04 21:39:47 +00:00
Yohei Yukawa
68c1e1935d Merge "Fix a behavior change in "Show software keyboard"." into nyc-dev 2016-05-04 21:39:15 +00:00
Vladislav Kaznacheev
040646bb08 Merge "Fix ClipData JavaDoc and behavior that contradicts JavaDoc" into nyc-dev am: 221c6e6db7 
am: 423c902258

* commit '423c9022582b2ae9397a4fb52b0293b313c785cf':
  Fix ClipData JavaDoc and behavior that contradicts JavaDoc

Change-Id: Ib6c6dc2770ff6332fbcb6285e871db971e54b066
 2016-05-04 21:38:17 +00:00
Makoto Onuki
5b9d876ef5 Merge "ShortcutManaegr: bug fixes" into nyc-mr1-dev 2016-05-04 21:28:17 +00:00
Wale Ogunwale
506a604200 Merge "Make sure to pause activity before stopping" into nyc-dev 
am: 5f81a3f84c

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

Change-Id: I24e550abc72f78904d04d1c0bd2c3a004328555f
 2016-05-04 20:48:54 +00:00
Dianne Hackborn
d8e877d27d Maybe fix issue #28457907: Pebble app crash + reboot 
Fix this long-standing multi-threading issue in Bundle
when multiple threads are trying to read from a Bundle
and conflict to due unparceling.

There are two critical sections this protects: writing
the bundle in to a parcel (when it is doing this from
the bundle's already parcelled representation), and
unparcelling a bundle into its map of entries.

Change-Id: I5470002f090e63dd623a573da6c204d3b5b661f4
 2016-05-04 13:43:58 -07:00
Chris Craik
fc56377178 Fix View leakage from mPreSortedChildren 
bug:28553824

Change-Id: I62bfa3dcb121792dff7d00be1f4b018a99c96e1d
 2016-05-04 13:40:07 -07:00
TreeHugger Robot
5f81a3f84c Merge "Make sure to pause activity before stopping" into nyc-dev 2016-05-04 20:28:51 +00:00
Makoto Onuki
8569452603 ShortcutManaegr: bug fixes 
Fixes 28590035
Fixes 28586105

Change-Id: Ia11d29e4996ad5b47b279a3c04d9586695cdc0a5
 2016-05-04 13:00:41 -07:00
Yohei Yukawa
d0d0797474 Fix a behavior change in "Show software keyboard". 
This bug was a corner case of stopping lying about
Configuration#keyboard when "Show software keyboard" is turned on, which
was done by my CL [1] in Android N development cycle.

Previous implementation

  if (config.keyboard != Configuration.KEYBOARD_NOKEYS) {

had relied on the fact that the system was lying about config.keyboard,
which is no longer valid.  We need to change the behavior of
InputMethodService#onShowInputRequested() depending on
Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD like we did for
InputMethodService#onEvaluateInputViewShown() in [1] to minimize the
impact on stopping lying about Configuration#keyboard.

 [1]: Id4d332e3909590c68345e10e1f2e18650efb2eb7
      7b739a802c

Bug: 28423439
Change-Id: I8a774cbf61ac706d8446be91b17bceee57a13656
 2016-05-04 11:56:35 -07:00
Robin Lee
cc1c55051c 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: Ibc69bb988ba0d1e641ee48fb5a844dc414f58e07
 2016-05-04 18:55:54 +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
7ec93a1ee2 Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev 2016-05-04 18:38:30 +00:00
Abhijith Shastry
71048da608 Merge "Update BlockedNumberContract documentation." into nyc-dev 
am: 9a2384a7a6

* commit '9a2384a7a6ad4ff630f125e844f7b202ec3cc649':
  Update BlockedNumberContract documentation.

Change-Id: Ia5962709e57374db6f01c7ba97d4a2dcf26a7b6e
 2016-05-04 18:22:39 +00:00