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

237830 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Michel Trivi
46ef3bdf28 Merge "API changes for audio recording notifications" into nyc-dev am: b74926232e 
am: 6bc51e0e5c

* commit '6bc51e0e5cb318bc9c1c92a1f70a434614a741fc':
  API changes for audio recording notifications
 2016-03-04 22:56:10 +00:00
Jean-Michel Trivi
6bc51e0e5c Merge "API changes for audio recording notifications" into nyc-dev 
am: b74926232e

* commit 'b74926232ee601851e08cd5d0f0386afcb0bef3e':
  API changes for audio recording notifications
 2016-03-04 22:53:58 +00:00
Jean-Michel Trivi
b74926232e Merge "API changes for audio recording notifications" into nyc-dev 2016-03-04 22:49:31 +00:00
Chris Wren
47029d1076 Merge "add more comments from the other file" into nyc-dev am: b279a8b39c 
am: 0eab4edab5

* commit '0eab4edab5b2976d4aea2258214e0c23193d03c8':
  add more comments from the other file
 2016-03-04 22:47:43 +00:00
Chris Wren
0eab4edab5 Merge "add more comments from the other file" into nyc-dev 
am: b279a8b39c

* commit 'b279a8b39c38e2d4f0db4e91d994ca7815b100b9':
  add more comments from the other file
 2016-03-04 22:45:46 +00:00
Aga Wronska
bfdf3d74de Merge "Made breadcrumb drop down match mocks" into nyc-dev am: e5a3bb76b8 
am: 9ca0c0564e

* commit '9ca0c0564e4991468b5a1434ac1b1334b7d9cda0':
  Made breadcrumb drop down match mocks
 2016-03-04 22:43:32 +00:00
Chris Wren
b279a8b39c Merge "add more comments from the other file" into nyc-dev 2016-03-04 22:42:03 +00:00
Aga Wronska
9ca0c0564e Merge "Made breadcrumb drop down match mocks" into nyc-dev 
am: e5a3bb76b8

* commit 'e5a3bb76b8b50aee73d7a7f23af67fc153564c2a':
  Made breadcrumb drop down match mocks
 2016-03-04 22:41:30 +00:00
Winson
5f32bac735 Merge "Use the non-override task progress for calculating the z." into nyc-dev am: e27a4376ab 
am: 895ceea504

* commit '895ceea504a4fded13cc08b654fea72167efd3e1':
  Use the non-override task progress for calculating the z.
 2016-03-04 22:39:48 +00:00
Aga Wronska
e5a3bb76b8 Merge "Made breadcrumb drop down match mocks" into nyc-dev 2016-03-04 22:37:41 +00:00
Winson
895ceea504 Merge "Use the non-override task progress for calculating the z." into nyc-dev 
am: e27a4376ab

* commit 'e27a4376aba021f72771d28daf656307a32e8ce3':
  Use the non-override task progress for calculating the z.
 2016-03-04 22:36:32 +00:00
Chris Wren
dc86f34a09 add more comments from the other file 
Bug: 27429645
Change-Id: Ie903240af25a15f0f57cda5a8c57377d001a2f2c
 2016-03-04 22:34:44 +00:00
Winson Chung
e27a4376ab Merge "Use the non-override task progress for calculating the z." into nyc-dev 2016-03-04 22:31:01 +00:00
Aga Wronska
b6db022312 Made breadcrumb drop down match mocks 
Bug: 27136601
Change-Id: I93af07a45defaddd7f5785fac8b686984a889583
 2016-03-04 14:05:39 -08:00
Roshan Pius
9cd0040ab4 WifiScanner: Add PNO public API am: e4fd150962 am: 56eac13284 
am: 3db959bbdb

* commit '3db959bbdb855a4738ed2887bb72cb964e742de6':
  WifiScanner: Add PNO public API
 2016-03-04 22:05:07 +00:00
Roshan Pius
3db959bbdb WifiScanner: Add PNO public API am: e4fd150962 
am: 56eac13284

* commit '56eac1328451a973984f39bb107ac808c3483465':
  WifiScanner: Add PNO public API
 2016-03-04 22:03:05 +00:00
Roshan Pius
56eac13284 WifiScanner: Add PNO public API 
am: e4fd150962

* commit 'e4fd150962e07dbcb0646d556bf372be0cc15f1f':
  WifiScanner: Add PNO public API
 2016-03-04 22:01:04 +00:00
Julia Reynolds
776b2133a6 Merge "Redlines for inline settings." into nyc-dev am: da52422a83 
am: 2a6646acdc

* commit '2a6646acdc561108d7f1090fb8bf3b7a3befa1c8':
  Redlines for inline settings.
 2016-03-04 21:58:59 +00:00
Julia Reynolds
2a6646acdc Merge "Redlines for inline settings." into nyc-dev 
am: da52422a83

* commit 'da52422a83536825dcc6ed9cb2255ae56ef3bfc2':
  Redlines for inline settings.
 2016-03-04 21:55:08 +00:00
Joe Onorato
b686b03272 Merge changes Ib6e0e6f3,I109f04c2,Idc716000,I44c51d5f,I810b9bd5, ... into nyc-dev am: 5d4ab988bd 
am: 15e93f3715

* commit '15e93f3715742d0ffad6089cf804842f2e5f393b':
  Turn down the logging a little bit.
  Turn down the logging a little bit and don't do a log wrapper function.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
 2016-03-04 21:53:06 +00:00
Jeff Sharkey
870f4b6521 Merge "Log FBE related flags when dumping packages." into nyc-dev am: a561e3a3b7 
am: 9d90a0f670

* commit '9d90a0f6706c5112710e7a84a5e1cf22ff9dd145':
  Log FBE related flags when dumping packages.
 2016-03-04 21:50:38 +00:00
Joe Onorato
15e93f3715 Merge changes Ib6e0e6f3,I109f04c2,Idc716000,I44c51d5f,I810b9bd5, ... into nyc-dev 
am: 5d4ab988bd

* commit '5d4ab988bd18bb1fc339f39d6f0cf225b6561903':
  Turn down the logging a little bit.
  Turn down the logging a little bit and don't do a log wrapper function.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
 2016-03-04 21:48:35 +00:00
Julia Reynolds
da52422a83 Merge "Redlines for inline settings." into nyc-dev 2016-03-04 21:47:56 +00:00
Jeff Sharkey
9d90a0f670 Merge "Log FBE related flags when dumping packages." into nyc-dev 
am: a561e3a3b7

* commit 'a561e3a3b782be3aa859b8c93f78205db1b429d7':
  Log FBE related flags when dumping packages.
 2016-03-04 21:45:54 +00:00
Joe Onorato
5d4ab988bd Merge changes Ib6e0e6f3,I109f04c2,Idc716000,I44c51d5f,I810b9bd5, ... into nyc-dev 
* changes:
  Turn down the logging a little bit.
  Turn down the logging a little bit and don't do a log wrapper function.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
 2016-03-04 21:39:14 +00:00
Roshan Pius
e4fd150962 WifiScanner: Add PNO public API 
Add the public interface for starting/stopping PNO scan.

This is the internal flow that is going to be used for PNO scan:
1. Set Pno list
2. Start background scan

This flow will not work as is for supplicant, since background scan is
done manually today. So, we'll need a flag to indicate that this
background scan is targetted for PNO.

BUG: 27167559
Change-Id: I3f6921c5d03f7d9e8ad1847e57e12fb38df6c9c9
TEST: Compiles & unit-test passes
 2016-03-04 13:37:48 -08:00
Jeff Sharkey
a561e3a3b7 Merge "Log FBE related flags when dumping packages." into nyc-dev 2016-03-04 21:35:35 +00:00
Chien-Yu Chen
273b311199 Merge "Camera2 Legacy: Connect to surfaces it produces" into nyc-dev am: 329484bb7e 
am: 475dd75224

* commit '475dd75224d0466d49b3791964a16c34f3a6b019':
  Camera2 Legacy: Connect to surfaces it produces
 2016-03-04 21:12:34 +00:00
Chien-Yu Chen
475dd75224 Merge "Camera2 Legacy: Connect to surfaces it produces" into nyc-dev 
am: 329484bb7e

* commit '329484bb7e31e3b0574cd25186a9d6a840f39781':
  Camera2 Legacy: Connect to surfaces it produces
 2016-03-04 21:10:22 +00:00
Chien-Yu Chen
329484bb7e Merge "Camera2 Legacy: Connect to surfaces it produces" into nyc-dev 2016-03-04 21:01:34 +00:00
Suprabh Shukla
250d834e59 Merge "Not clearing data for a package that is a DO or PO" into nyc-dev am: e1fd7f09d5 
am: 8f50b747ed

* commit '8f50b747ed1586081126d09aa78a72c1c2fc927f':
  Not clearing data for a package that is a DO or PO
 2016-03-04 20:45:30 +00:00
Suprabh Shukla
8f50b747ed Merge "Not clearing data for a package that is a DO or PO" into nyc-dev 
am: e1fd7f09d5

* commit 'e1fd7f09d5149055b8ad7bcf24846ecd8d87027a':
  Not clearing data for a package that is a DO or PO
 2016-03-04 20:43:25 +00:00
Suprabh Shukla
e1fd7f09d5 Merge "Not clearing data for a package that is a DO or PO" into nyc-dev 2016-03-04 20:38:44 +00:00
Joe Onorato
12acbd7836 Turn down the logging a little bit. 
Change-Id: Ib6e0e6f3577afac3b9bfe9a9b1cce70fb16d9d04
 2016-03-04 12:21:30 -08:00
Joe Onorato
f188d41fa2 Turn down the logging a little bit and don't do a log wrapper function. 
Change-Id: I109f04c2c2299f26e21b076df3a935ce2d356bdf
 2016-03-04 12:21:30 -08:00
Joe Onorato
a102dd01e9 Turn down the logging a little bit. 
Change-Id: Idc716000ba5d28f52aee3e1cb84832e1c6eaf440
 2016-03-04 12:21:30 -08:00
Joe Onorato
0aa05d7388 Turn down the logging a little bit. 
Change-Id: I44c51d5f8248df1f8cca19da802ee891afe78af7
 2016-03-04 12:21:30 -08:00
Joe Onorato
3973b1a75d Turn down the logging a little bit. 
Change-Id: I810b9bd58412d2b38d8ce4497baa71047125b92f
 2016-03-04 12:21:30 -08:00
Joe Onorato
1e55375c96 Turn down the logging a little bit. 
Change-Id: I14762c5cc3706c31bd1b3868eac2528ae981aef8
 2016-03-04 12:21:30 -08:00
Joe Onorato
93dcff0122 Turn down the logging a little bit. 
Change-Id: I5760eb7d6d6ed5e8a3426e92c835e8a71e10cdbb
 2016-03-04 12:21:30 -08:00
Eino-Ville Talvala
578bc5b803 Merge "DngCreator: Improve BlackLevel, fix thumbnail metadata" into nyc-dev am: 8a35cbf45b 
am: 45b7b6a1db

* commit '45b7b6a1db697f24fa0a808da9bdf7cd08be4d3d':
  DngCreator: Improve BlackLevel, fix thumbnail metadata
 2016-03-04 20:19:22 +00:00
Chih-hung Hsieh
4ee498dc75 Merge "Enable clang for arm64." 2016-03-04 20:17:18 +00:00
Eino-Ville Talvala
45b7b6a1db Merge "DngCreator: Improve BlackLevel, fix thumbnail metadata" into nyc-dev 
am: 8a35cbf45b

* commit '8a35cbf45bce1d09ab0ef222331edf811f50985d':
  DngCreator: Improve BlackLevel, fix thumbnail metadata
 2016-03-04 20:15:35 +00:00
Eino-Ville Talvala
8a35cbf45b Merge "DngCreator: Improve BlackLevel, fix thumbnail metadata" into nyc-dev 2016-03-04 20:07:43 +00:00
Steve McKay
0c648c6648 Merge "Revert "Hide Files app launcher icon."" into nyc-dev am: 9eb7190af5 
am: 5b7abfb55d

* commit '5b7abfb55d2ce1ffe5e89e6c5e995c34e9eff9e1':
  Revert "Hide Files app launcher icon."
 2016-03-04 20:01:18 +00:00
Steve McKay
5b7abfb55d Merge "Revert "Hide Files app launcher icon."" into nyc-dev 
am: 9eb7190af5

* commit '9eb7190af54f3534afd3887c68cd414b210a1628':
  Revert "Hide Files app launcher icon."
 2016-03-04 19:58:06 +00:00
Steve McKay
9eb7190af5 Merge "Revert "Hide Files app launcher icon."" into nyc-dev 2016-03-04 19:54:36 +00:00
Steve McKay
080d71b130 Revert "Hide Files app launcher icon." 
This reverts commit 24e4604595.

Un-hiding this for continued development in nyc-dev.

Based on conversations between those at higher paygrades, we'll either leave this visible or re-hide prior to next dev release.

Change-Id: I235eb0f593daa7b34ea10ed4c9df4eaa6c68078c
 2016-03-04 19:52:55 +00:00
Jeff Sharkey
effcd93594 Log FBE related flags when dumping packages. 
Bug: 27455726
Change-Id: I18146431792d5be0808ff6044174eff328039251
 2016-03-04 12:52:39 -07:00
Steve McKay
4608fbe713 Merge "Hide Files app launcher icon." into nyc-dev am: 58e8d467bd 
am: 3bfedb2054

* commit '3bfedb205406c70d8214d2e6aa42c3cb39ebc87d':
  Hide Files app launcher icon.
 2016-03-04 19:51:14 +00:00