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

61978 Commits

Author SHA1 Message Date
Renat Aksitov
e6a7d979de Merge "Voice Messaging Intent API." into nyc-dev am: 8351ff25a1 
am: 6bfc3bd8f8

* commit '6bfc3bd8f872e717723fd04d89f47fdec09aabf7':
  Voice Messaging Intent API.
 2016-03-03 02:00:22 +00:00
Yohei Yukawa
6b7e4d2c60 Merge "Add more JavaDoc to InputConnectionWrapper." into nyc-dev am: 3d68c9d30f 
am: c4759151c4

* commit 'c4759151c43d9d18da6b60e08975603cc1213172':
  Add more JavaDoc to InputConnectionWrapper.
 2016-03-03 01:54:58 +00:00
Renat Aksitov
6bfc3bd8f8 Merge "Voice Messaging Intent API." into nyc-dev 
am: 8351ff25a1

* commit '8351ff25a1ef25dad69cf45431ba8aa82487bcd5':
  Voice Messaging Intent API.
 2016-03-03 01:25:56 +00:00
Yohei Yukawa
c4759151c4 Merge "Add more JavaDoc to InputConnectionWrapper." into nyc-dev 
am: 3d68c9d30f

* commit '3d68c9d30fa9c95b49a9d6c8ba6db12dac47c2d7':
  Add more JavaDoc to InputConnectionWrapper.
 2016-03-03 01:22:45 +00:00
Selim Gurun
12a563f457 Merge "Revert "Add some View methods overrides and WebViewDelegate interfaces."" 2016-03-03 00:52:39 +00:00
Selim Gurun
7ef5429637 Revert "Add some View methods overrides and WebViewDelegate interfaces." 
This reverts commit 73a7494231.

Change-Id: I3a403c224a074cfc9952d3b421027c9538eaa30b
 2016-03-03 00:52:11 +00:00
Renat Aksitov
8351ff25a1 Merge "Voice Messaging Intent API." into nyc-dev 2016-03-02 23:47:25 +00:00
Yohei Yukawa
3d68c9d30f Merge "Add more JavaDoc to InputConnectionWrapper." into nyc-dev 2016-03-02 23:35:35 +00:00
Wale Ogunwale
a0c55d2700 Merge "config_supportsMultiWindow for device to specify multi-window support" into nyc-dev am: 3716e52be5 
am: feb39e5ba8

* commit 'feb39e5ba8f6866360ff0fcc48317f73ed4aed68':
  config_supportsMultiWindow for device to specify multi-window support
 2016-03-02 23:11:00 +00:00
Eino-Ville Talvala
0fd379edd6 Merge "Camera2: Switch to auto-gen C++ binder interfaces" into nyc-dev am: 74989b4d3f 
am: 72071de87c

* commit '72071de87c62717cc85937b319df8df10cf4b7e9':
  Camera2: Switch to auto-gen C++ binder interfaces
 2016-03-02 23:08:24 +00:00
Wale Ogunwale
feb39e5ba8 Merge "config_supportsMultiWindow for device to specify multi-window support" into nyc-dev 
am: 3716e52be5

* commit '3716e52be592482534943d32ba0f72309305a224':
  config_supportsMultiWindow for device to specify multi-window support
 2016-03-02 22:55:55 +00:00
Eino-Ville Talvala
72071de87c Merge "Camera2: Switch to auto-gen C++ binder interfaces" into nyc-dev 
am: 74989b4d3f

* commit '74989b4d3ffdcd3def599e1f973d481062ba8e6f':
  Camera2: Switch to auto-gen C++ binder interfaces
 2016-03-02 22:50:14 +00:00
Ido Ofir
89348096d9 Merge "checking additional metadata and completed categories before displaying suggested actions in settings." into nyc-dev am: 51e06e011d 
am: 379db962ef

* commit '379db962ef703e7ad7bb2d8abeb789f0abbf06df':
  checking additional metadata and completed categories before displaying suggested actions in settings.
 2016-03-02 22:49:30 +00:00
Wale Ogunwale
3716e52be5 Merge "config_supportsMultiWindow for device to specify multi-window support" into nyc-dev 2016-03-02 21:55:22 +00:00
Chong Zhang
3021300491 Merge "Force disconnect when the surface is about to be saved." into nyc-dev am: f8fd852060 
am: d1f8eb3f7b

* commit 'd1f8eb3f7b387af17b6fa0412293782d64d5828d':
  Force disconnect when the surface is about to be saved.
 2016-03-02 21:50:27 +00:00
Eino-Ville Talvala
74989b4d3f Merge "Camera2: Switch to auto-gen C++ binder interfaces" into nyc-dev 2016-03-02 21:47:13 +00:00
Robin Lee
fbf2544cae Merge "DevicePolicyManager#removeKeyPair- update contract" into nyc-dev am: e4872f2a52 
am: 460af2050b

* commit '460af2050ba7ba60d809768cbdbf1772876de3bb':
  DevicePolicyManager#removeKeyPair- update contract
 2016-03-02 21:45:54 +00:00
Ido Ofir
379db962ef Merge "checking additional metadata and completed categories before displaying suggested actions in settings." into nyc-dev 
am: 51e06e011d

* commit '51e06e011d3694d410718dafe15341f8bd9cd392':
  checking additional metadata and completed categories before displaying suggested actions in settings.
 2016-03-02 21:43:58 +00:00
Ido Ofir
51e06e011d Merge "checking additional metadata and completed categories before displaying suggested actions in settings." into nyc-dev 2016-03-02 21:30:36 +00:00
Steve McKay
24dd9ad0c0 Merge "Always show intern storage." into nyc-dev am: b4672ef6df 
am: 1788dfd223

* commit '1788dfd223c7c62005b8c1e98cd25737f685a912':
  Always show intern storage.
 2016-03-02 20:32:39 +00:00
Chong Zhang
d1f8eb3f7b Merge "Force disconnect when the surface is about to be saved." into nyc-dev 
am: f8fd852060

* commit 'f8fd8520606ff579f966a0f76864c7e5ee1b35ef':
  Force disconnect when the surface is about to be saved.
 2016-03-02 20:30:52 +00:00
Robin Lee
460af2050b Merge "DevicePolicyManager#removeKeyPair- update contract" into nyc-dev 
am: e4872f2a52

* commit 'e4872f2a52b1929b25e982e7cd050b0f95d73cc1':
  DevicePolicyManager#removeKeyPair- update contract
 2016-03-02 20:27:06 +00:00
Chong Zhang
a65c68cb3d Merge "Don\'t change resize mode if AM didn\'t dock the task as requested" into nyc-dev am: 5d9de3ab6f 
am: 20862420c2

* commit '20862420c23bab9a83d79ac5c81745e7aae24536':
  Don't change resize mode if AM didn't dock the task as requested
 2016-03-02 20:25:35 +00:00
Chong Zhang
f8fd852060 Merge "Force disconnect when the surface is about to be saved." into nyc-dev 2016-03-02 20:10:10 +00:00
Robin Lee
e4872f2a52 Merge "DevicePolicyManager#removeKeyPair- update contract" into nyc-dev 2016-03-02 20:05:41 +00:00
Robin Lee
8f617d40ab DevicePolicyManager#removeKeyPair- update contract 
May also return true if the keypair didn't exist in the first place
which is a small reduction in the amount of information leakage, but
more importantly lets a caller be sure about keystore state at the end
of their call.

Bug: 27335182
Change-Id: I5e6d4c599b74f031e3f6d17cb7540898ffaf2571
 2016-03-02 19:54:04 +00:00
Steve McKay
1788dfd223 Merge "Always show intern storage." into nyc-dev 
am: b4672ef6df

* commit 'b4672ef6dfbaf416981539d515ad1489d7d0bc87':
  Always show intern storage.
 2016-03-02 19:02:19 +00:00
Steve McKay
b4672ef6df Merge "Always show intern storage." into nyc-dev 2016-03-02 18:49:28 +00:00
Steve McKay
7c4395804e Always show intern storage. 
Only show debug root when devel mode is enabled.
Remove all traces of "advanced".

Bug: 27297398

Change-Id: Ie7e8be282531bd245351d56ababa8ca625c10fd2
 2016-03-02 10:47:59 -08:00
Chong Zhang
20862420c2 Merge "Don\'t change resize mode if AM didn\'t dock the task as requested" into nyc-dev 
am: 5d9de3ab6f

* commit '5d9de3ab6f768c9b9d5c4fa627ce019f74370531':
  Don't change resize mode if AM didn't dock the task as requested
 2016-03-02 18:42:42 +00:00
Chong Zhang
5d9de3ab6f Merge "Don't change resize mode if AM didn't dock the task as requested" into nyc-dev 2016-03-02 18:30:00 +00:00
Greg Kaiser
62ff8f83f7 Merge "SensorEventListener: Clarify documentation." into nyc-dev am: 7d3a9e5259 
am: 09c7c0ed3e

* commit '09c7c0ed3ecbc181e0de1fb2a6d91eabd9761520':
  SensorEventListener: Clarify documentation.
 2016-03-02 18:15:21 +00:00
Greg Kaiser
db151c1987 Merge "doc: Fix syntax error in code example." into nyc-dev am: fa806c5031 
am: 789071d5cc

* commit '789071d5ccf6d4a45142e6d23485b11a767c4d65':
  doc: Fix syntax error in code example.
 2016-03-02 18:13:35 +00:00
Ido Ofir
d193c6729f checking additional metadata and completed categories before displaying 
suggested actions in settings.

Bug: 27271616
Change-Id: I855bc03337b04c5ff685c102f44dfc0d6638592b
 2016-03-02 09:58:59 -08:00
Greg Kaiser
09c7c0ed3e Merge "SensorEventListener: Clarify documentation." into nyc-dev 
am: 7d3a9e5259

* commit '7d3a9e525943705c7a6dca11929cfba29b2a24c1':
  SensorEventListener: Clarify documentation.
 2016-03-02 17:50:18 +00:00
Greg Kaiser
789071d5cc Merge "doc: Fix syntax error in code example." into nyc-dev 
am: fa806c5031

* commit 'fa806c5031028353c7b16c20a4f5c77246221112':
  doc: Fix syntax error in code example.
 2016-03-02 17:47:58 +00:00
Keun-young Park
19f517777b Merge "Revert "Revert "make isUiModeLocked, isNightModeLocked test api""" into nyc-dev am: 98e386f650 
am: b023406ab4

* commit 'b023406ab466224f6f8c8fc2c0f2c3717435a18d':
  Revert "Revert "make isUiModeLocked, isNightModeLocked test api""
 2016-03-02 17:36:13 +00:00
Greg Kaiser
7d3a9e5259 Merge "SensorEventListener: Clarify documentation." into nyc-dev 2016-03-02 17:27:47 +00:00
Greg Kaiser
fa806c5031 Merge "doc: Fix syntax error in code example." into nyc-dev 2016-03-02 17:26:45 +00:00
Keun-young Park
b023406ab4 Merge "Revert "Revert "make isUiModeLocked, isNightModeLocked test api""" into nyc-dev 
am: 98e386f650

* commit '98e386f650d5f6d05792d164e78ff3cbdbc5381e':
  Revert "Revert "make isUiModeLocked, isNightModeLocked test api""
 2016-03-02 17:22:53 +00:00
Keun-young Park
98e386f650 Merge "Revert "Revert "make isUiModeLocked, isNightModeLocked test api""" into nyc-dev 2016-03-02 17:12:42 +00:00
Calin Juravle
1389e993aa Merge "Simplify the error logs for profiles we can\'t open." into nyc-dev am: 3977f20d00 
am: 355a74150d

* commit '355a74150d3be8a86a7cea3d64d9be1aab442225':
  Simplify the error logs for profiles we can't open.
 2016-03-02 16:44:54 +00:00
Calin Juravle
355a74150d Merge "Simplify the error logs for profiles we can\'t open." into nyc-dev 
am: 3977f20d00

* commit '3977f20d002c803f211599b44f457ff7dc3e7dd6':
  Simplify the error logs for profiles we can't open.
 2016-03-02 16:32:00 +00:00
Wale Ogunwale
fb1c86439c config_supportsMultiWindow for device to specify multi-window support 
Devices that have the config set to false will not allow any multi-window
operation.

Also, added ActivityManager.supportsMultiWindow that checks the new config
and also returns false if the device is a low RAM device.

Bug: 27419483
Change-Id: I8dd85c17d290a5a752de3253beb3b34c17d7736d
 2016-03-02 08:28:08 -08:00
Calin Juravle
3977f20d00 Merge "Simplify the error logs for profiles we can't open." into nyc-dev 2016-03-02 16:17:34 +00:00
Nimrod Gileadi
727b62a028 Merge "Close InputStream in BatteryStatsHelper" into nyc-dev am: c14893bf5a 
am: a2f24a01f1

* commit 'a2f24a01f1d47888abde620cce003c9e11bd49f4':
  Close InputStream in BatteryStatsHelper
 2016-03-02 09:45:09 +00:00
Nimrod Gileadi
a2f24a01f1 Merge "Close InputStream in BatteryStatsHelper" into nyc-dev 
am: c14893bf5a

* commit 'c14893bf5a2ad76ad6279f09b66020610e32041f':
  Close InputStream in BatteryStatsHelper
 2016-03-02 09:24:38 +00:00
Nimrod Gileadi
c14893bf5a Merge "Close InputStream in BatteryStatsHelper" into nyc-dev 2016-03-02 09:17:21 +00:00
Lorenzo Colitti
e22fc07fa9 Merge changes Id78aab9c,I51096b18 into nyc-dev am: 1856df512f 
am: 057f24547a

* commit '057f24547afe0e2122863cab96b8149a43d3cf2d':
  Speed up ConnectivityServiceTest.
  Make it easier to test code that uses WakeupMessage.
 2016-03-02 08:59:08 +00:00
Lorenzo Colitti
057f24547a Merge changes Id78aab9c,I51096b18 into nyc-dev 
am: 1856df512f

* commit '1856df512fc3d69096505491512fa26fb8ffdc09':
  Speed up ConnectivityServiceTest.
  Make it easier to test code that uses WakeupMessage.
 2016-03-02 08:38:59 +00:00