drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
165,481 Commits 1 Branch 0 Tags
Commit Graph

165481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Roos
621823e064 am 53f30ec2: am bcd07652: Add API for querying trusted state 
* commit '53f30ec270db8c6b92ff06579cf4c591efe2544b':
  Add API for querying trusted state
 2014-10-24 13:27:39 +00:00
Adrian Roos
53f30ec270 am bcd07652: Add API for querying trusted state 
* commit 'bcd076525ccb8a3dfe7d1002bcae059661c1d111':
  Add API for querying trusted state
 2014-10-24 13:21:30 +00:00
Adrian Roos
2ace72544a SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState 
Bug: 18084166
Change-Id: I7d8695f4b576676cc6da1fe07fea05e72d04f33e
 2014-10-24 14:35:26 +02:00
Adrian Roos
bcd076525c Add API for querying trusted state 
Bug: 18084166
Change-Id: Ic755461cc6978943aef4943def93a0e38a1c96c0
 2014-10-24 13:59:45 +02:00
Narayan Kamath
0d50b5d0ee am e572a77f: am fa36b36c: Merge "Deprecate more apache-http." into lmp-mr1-dev 
* commit 'e572a77f05948fdc9c17ccdce0784d8b179a03ee':
  Deprecate more apache-http.
 2014-10-24 10:40:00 +00:00
Narayan Kamath
8e5cf189f1 am 2f348393: am 7eafd944: Merge "Deprecate apache-http." into lmp-mr1-dev 
* commit '2f3483939e7cc0cf99c3154896604857af3a2c1a':
  Deprecate apache-http.
 2014-10-24 10:39:54 +00:00
Yuncheol Heo
b10d25fc96 am ddb863f4: am 5b062e07: Merge "CEC: Fix apilint errors." into lmp-mr1-dev 
* commit 'ddb863f42832e5dcc0f5167ce5ba7ecea2d977a4':
  CEC: Fix apilint errors.
 2014-10-24 10:39:50 +00:00
Neil Fuller
a021e92218 resolved conflicts for merge of 12260ad7 to lmp-mr1-dev-plus-aosp 
Change-Id: Ie2222794208475216941289cf062e05ca9c75e0f
 2014-10-24 11:36:46 +01:00
Joe Fernandez
90f734eb18 am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs 
* commit '0e893eb7ac1985a02d61525a5e6076d45a1e8c7d':
  docs:Added 64-bit image note from Preview page
 2014-10-24 09:27:02 +00:00
Narayan Kamath
e572a77f05 am fa36b36c: Merge "Deprecate more apache-http." into lmp-mr1-dev 
* commit 'fa36b36c8b66fc89f446a9eb065c31a1b224e662':
  Deprecate more apache-http.
 2014-10-24 09:13:22 +00:00
Narayan Kamath
2f3483939e am 7eafd944: Merge "Deprecate apache-http." into lmp-mr1-dev 
* commit '7eafd944cd5845001a0b2562f55685832d8023f3':
  Deprecate apache-http.
 2014-10-24 09:13:17 +00:00
Yuncheol Heo
ddb863f428 am 5b062e07: Merge "CEC: Fix apilint errors." into lmp-mr1-dev 
* commit '5b062e07c5a647d12cbeb9dace7806b54d459c56':
  CEC: Fix apilint errors.
 2014-10-24 09:13:14 +00:00
Neil Fuller
12260ad72c am 07ff2f72: Merge "Deprecating FloatMath and Time" into lmp-mr1-dev 
* commit '07ff2f72c8ae14415d784ddeb3944c5a9b188a83':
  Deprecating FloatMath and Time
 2014-10-24 09:13:09 +00:00
Narayan Kamath
fa36b36c8b Merge "Deprecate more apache-http." into lmp-mr1-dev 2014-10-24 08:58:45 +00:00
Narayan Kamath
7eafd944cd Merge "Deprecate apache-http." into lmp-mr1-dev 2014-10-24 08:56:56 +00:00
Yuncheol Heo
5b062e07c5 Merge "CEC: Fix apilint errors." into lmp-mr1-dev 2014-10-24 08:48:30 +00:00
Natalie Masse
bcf9ced47a am 1e5bb861: Link and typo fixed 
* commit '1e5bb861265072b9af555d09202e49cb38a3c4f1':
  Link and typo fixed
 2014-10-24 08:13:36 +00:00
Neil Fuller
07ff2f72c8 Merge "Deprecating FloatMath and Time" into lmp-mr1-dev 2014-10-24 08:10:39 +00:00
Joe Fernandez
789ca68203 am d3d0181c: am f7b6575d: am 57f1fd19: am cab73381: Merge "docs: Fix typo in search class" into lmp-dev 
* commit 'd3d0181cebd978a5ce798af382b9566b1111da5c':
  docs: Fix typo in search class
 2014-10-24 06:50:50 +00:00
Joe Fernandez
3909359df3 am 34e4bcfa: am 469413bd: am 45812860: am 553dd209: Merge "docs: Fixed 404 link in SDK Tools page." into lmp-dev 
* commit '34e4bcfa7b21f5410d19af03aaecfd0337ba4c97':
  docs: Fixed 404 link in SDK Tools page.
 2014-10-24 06:50:45 +00:00
Joe Fernandez
d8c5b0e773 am 95ddc11b: am 20665087: am c53546e9: am 3b6d518e: Merge "docs: Fix hprof-conv location in docs." into lmp-dev 
* commit '95ddc11bb7b783efa353a7cbe45e3a084f8d8061':
  docs: Fix hprof-conv location in docs.
 2014-10-24 06:45:11 +00:00
Joe Fernandez
868921ec59 am 95aac259: am 9847bcec: am b1183953: am 4ae8b8f3: Merge "docs: Fixing misc minor bugs." into lmp-dev 
* commit '95aac259de7d4c6c8cfc6e8c6f708ceaaa75b5a1':
  docs: Fixing misc minor bugs.
 2014-10-24 06:45:02 +00:00
Joe Fernandez
d3d0181ceb am f7b6575d: am 57f1fd19: am cab73381: Merge "docs: Fix typo in search class" into lmp-dev 
* commit 'f7b6575df8fc6320771d3cca7852eb54bd4199ec':
  docs: Fix typo in search class
 2014-10-24 06:33:05 +00:00
Joe Fernandez
34e4bcfa7b am 469413bd: am 45812860: am 553dd209: Merge "docs: Fixed 404 link in SDK Tools page." into lmp-dev 
* commit '469413bd80d62b4b4aa50ad728eeea117e8aab7e':
  docs: Fixed 404 link in SDK Tools page.
 2014-10-24 06:33:00 +00:00
Yuncheol Heo
2b0da5c4c8 CEC: Fix apilint errors. 
- Change 'protected' to 'package private'.
- Change '@hide' to '{@hide}' for methods which should be still hidden
  for linting.
- Rename addVendorCommandListener to setVendorCommandListener and make sure to be called once.
- Fix the implementation of removeHotplugEventListener().

Bug: 18063669
Change-Id: I5c032736f17bab9518f21596f7adeac2f88ba4c1
 2014-10-24 15:30:48 +09:00
Joe Fernandez
95ddc11bb7 am 20665087: am c53546e9: am 3b6d518e: Merge "docs: Fix hprof-conv location in docs." into lmp-dev 
* commit '206650878455f36bcc6b51984e8fedf141270030':
  docs: Fix hprof-conv location in docs.
 2014-10-24 06:26:33 +00:00
Joe Fernandez
95aac259de am 9847bcec: am b1183953: am 4ae8b8f3: Merge "docs: Fixing misc minor bugs." into lmp-dev 
* commit '9847bcec66ebea4c655f6144b0cb5c0d01a7f862':
  docs: Fixing misc minor bugs.
 2014-10-24 06:26:28 +00:00
Joe Fernandez
f7b6575df8 am 57f1fd19: am cab73381: Merge "docs: Fix typo in search class" into lmp-dev 
* commit '57f1fd1993e59f30aee3b677b9704107d1044400':
  docs: Fix typo in search class
 2014-10-24 06:20:21 +00:00
Joe Fernandez
469413bd80 am 45812860: am 553dd209: Merge "docs: Fixed 404 link in SDK Tools page." into lmp-dev 
* commit '458128603f2a061f59b96fd3c5e92ad974f81089':
  docs: Fixed 404 link in SDK Tools page.
 2014-10-24 06:20:18 +00:00
Joe Fernandez
2066508784 am c53546e9: am 3b6d518e: Merge "docs: Fix hprof-conv location in docs." into lmp-dev 
* commit 'c53546e9c23959531cd7ff6b2cb85e4085208ce0':
  docs: Fix hprof-conv location in docs.
 2014-10-24 06:13:50 +00:00
Joe Fernandez
9847bcec66 am b1183953: am 4ae8b8f3: Merge "docs: Fixing misc minor bugs." into lmp-dev 
* commit 'b1183953461319d9ff2919d8ac9cb1bc3e24353b':
  docs: Fixing misc minor bugs.
 2014-10-24 06:13:44 +00:00
Joe Fernandez
57f1fd1993 am cab73381: Merge "docs: Fix typo in search class" into lmp-dev 
* commit 'cab733811554ffcf257ee194a5245521713faf5d':
  docs: Fix typo in search class
 2014-10-24 06:08:43 +00:00
Joe Fernandez
458128603f am 553dd209: Merge "docs: Fixed 404 link in SDK Tools page." into lmp-dev 
* commit '553dd209992ffe9bba1160333762c5f3fa6651b0':
  docs: Fixed 404 link in SDK Tools page.
 2014-10-24 06:08:40 +00:00
Joe Fernandez
0e893eb7ac Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs 2014-10-24 06:06:01 +00:00
Joe Fernandez
c53546e9c2 am 3b6d518e: Merge "docs: Fix hprof-conv location in docs." into lmp-dev 
* commit '3b6d518e79c1045286d2bc368148b44dd1a39bf3':
  docs: Fix hprof-conv location in docs.
 2014-10-24 06:02:35 +00:00
Joe Fernandez
b118395346 am 4ae8b8f3: Merge "docs: Fixing misc minor bugs." into lmp-dev 
* commit '4ae8b8f3652ed2382ee5593151ea72b315fb5384':
  docs: Fixing misc minor bugs.
 2014-10-24 06:02:31 +00:00
Joe Fernandez
cab7338115 Merge "docs: Fix typo in search class" into lmp-dev 2014-10-24 06:01:57 +00:00
Joe Fernandez
553dd20999 Merge "docs: Fixed 404 link in SDK Tools page." into lmp-dev 2014-10-24 06:00:56 +00:00
Joe Fernandez
3b6d518e79 Merge "docs: Fix hprof-conv location in docs." into lmp-dev 2014-10-24 06:00:19 +00:00
Joe Fernandez
4ae8b8f365 Merge "docs: Fixing misc minor bugs." into lmp-dev 2014-10-24 05:59:04 +00:00
Wink Saville
63f03dd94c Change subId to int from long 
Change-Id: Idae6335e63e7b1e4e714bc17e71b1a4705e38474
 2014-10-23 21:54:09 -07:00
Takayuki Hoshi
c1e8f471db am ee57224c: Merge "Fix a bug where LocationManager\'s addGpsStatusListener does not throw a SecurityException if LocationManagerService.mGpsStatusProvider is null even when ACCESS_FINE_LOCATION permission is not present." into lmp-mr1-dev 
automerge: e6ad5f7

* commit 'e6ad5f75fcbbe1555411fe1923d5bb07977877d7':
  Fix a bug where LocationManager's addGpsStatusListener does not throw a SecurityException if LocationManagerService.mGpsStatusProvider is null even when ACCESS_FINE_LOCATION permission is not present.
 2014-10-24 04:31:04 +00:00
Takayuki Hoshi
e6ad5f75fc am ee57224c: Merge "Fix a bug where LocationManager\'s addGpsStatusListener does not throw a SecurityException if LocationManagerService.mGpsStatusProvider is null even when ACCESS_FINE_LOCATION permission is not present." into lmp-mr1-dev 
* commit 'ee57224c0f96b4a4e26fe89f40509b32ea4b3602':
  Fix a bug where LocationManager's addGpsStatusListener does not throw a SecurityException if LocationManagerService.mGpsStatusProvider is null even when ACCESS_FINE_LOCATION permission is not present.
 2014-10-24 04:14:20 +00:00
Takayuki Hoshi
ee57224c0f Merge "Fix a bug where LocationManager's addGpsStatusListener does not throw a SecurityException if LocationManagerService.mGpsStatusProvider is null even when ACCESS_FINE_LOCATION permission is not present." into lmp-mr1-dev 2014-10-24 04:02:52 +00:00
Hochi Huang
2a4425c172 am 35658cc4: am 4a7873f1: [FM]Fix FM App record fail Buganizer ID: 17975676 
automerge: 8659bf1

* commit '8659bf1929ee2cc4b3c7fd8eaa43825b6d069fb1':
  [FM]Fix  FM App record fail Buganizer ID: 17975676
 2014-10-24 03:39:36 +00:00
Hochi Huang
8659bf1929 am 35658cc4: am 4a7873f1: [FM]Fix FM App record fail Buganizer ID: 17975676 
* commit '35658cc42e381cba50c386464608e546c08a8b55':
  [FM]Fix  FM App record fail Buganizer ID: 17975676
 2014-10-24 03:30:31 +00:00
Dongwon Kang
27c7a7d06b Merge "TIF: Define more cannonical genres in TvContract" into lmp-mr1-dev automerge: f6df7bf 
automerge: d048789

* commit 'd048789aeaf64779a7062faa3bd806c69652857a':
  TIF: Define more cannonical genres in TvContract
 2014-10-24 03:24:49 +00:00
Hochi Huang
35658cc42e am 4a7873f1: [FM]Fix FM App record fail Buganizer ID: 17975676 
* commit '4a7873f19afecb01ef06b0f3dc4dde0a13a17ab3':
  [FM]Fix  FM App record fail Buganizer ID: 17975676
 2014-10-24 03:17:24 +00:00
Dongwon Kang
d048789aea Merge "TIF: Define more cannonical genres in TvContract" into lmp-mr1-dev 
automerge: f6df7bf

* commit 'f6df7bff53d325e11233bc08fbf5a3f212723b79':
  TIF: Define more cannonical genres in TvContract
 2014-10-24 03:16:55 +00:00
Svet Ganov
2916f658c9 Sometimes historical printers not properly ordered. 
We order printers based on past usage. In some cases the ordering
does not work. The reason for that was an incorrect assumption that
the entries in an ArrayMap are ordered in the order they are added.

bug:18109283

Change-Id: Ie367e4ca5e6bd79f335a060074c9211054e3a931
 2014-10-23 20:10:10 -07:00