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

93881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Hampson
fd0b25875c am 6a9d5761: EthernetDataTracker: Start DHCP on Link Up 
* commit '6a9d57617a9b502c65d62f053ad8bd0309afdc24':
  EthernetDataTracker: Start DHCP on Link Up
 2012-12-06 18:58:10 -08:00
Irfan Sheriff
628ba035b3 am 1612e298: Merge "AsyncChannel to support remote death notification and post a disconnect message to the source handler." 
* commit '1612e29826dfe55f8deca27374046c5931ce5335':
  AsyncChannel to support remote death notification and post a disconnect message to the source handler.
 2012-12-06 10:59:10 -08:00
Irfan Sheriff
46e3807952 am c602187e: Merge "Prevent scanning during DHCP process" 
* commit 'c602187e51aa6e8c46bffa5fb2603e368d83ea95':
  Prevent scanning during DHCP process
 2012-12-06 10:39:04 -08:00
Irfan Sheriff
1612e29826 Merge "AsyncChannel to support remote death notification and post a disconnect message to the source handler." 2012-12-05 20:33:37 -08:00
The Android Open Source Project
08500d5741 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I68071eb0e5fc2164b29cda613bfb490fc80f8e12
 2012-12-05 11:08:55 -08:00
Adam Hampson
6a9d57617a EthernetDataTracker: Start DHCP on Link Up 
The behavior of mLinkUp has previously changed so that it only
represents the link state.  This changes fixes
interfaceLinkStateChanged() so that it triggers a reconnect based
only on the present link state.

Change-Id: I950e04e1f5b5019d59d3b9530f369f8b8f13134a
Signed-off-by: Adam Hampson <ahampson@google.com>
 2012-12-05 10:29:23 -08:00
The Android Automerger
c1988b66a5 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-05 10:27:48 -08:00
Irfan Sheriff
c602187e51 Merge "Prevent scanning during DHCP process" 2012-12-05 09:25:43 -08:00
Amith Yamasani
368ee53f25 am f663cad2: am 6c58b155: Merge "Make 3rd party lockscreen widgets work on secondary users" into jb-mr1.1-dev 
* commit 'f663cad2248d5d38957f8e1408cd794c0de90202':
  Make 3rd party lockscreen widgets work on secondary users
 2012-12-05 06:06:02 -08:00
Amith Yamasani
f663cad224 am 6c58b155: Merge "Make 3rd party lockscreen widgets work on secondary users" into jb-mr1.1-dev 
* commit '6c58b155c3bdde355adb03b191e43d8eec089fb2':
  Make 3rd party lockscreen widgets work on secondary users
 2012-12-05 06:03:32 -08:00
Amith Yamasani
6c58b155c3 Merge "Make 3rd party lockscreen widgets work on secondary users" into jb-mr1.1-dev 2012-12-05 05:45:00 -08:00
The Android Automerger
84add94ed2 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-04 19:58:57 -08:00
Dirk Dougherty
6350cfb529 am 6a3ad968: am 1cb5ad47: am 147b01bc: Merge "Doc change: In-app Billing -- add notes about orderId change and subscription orderIds." into jb-mr1-dev 
* commit '6a3ad968318f7b655b871972770a2bd344adaec5':
  Doc change: In-app Billing -- add notes about orderId change and subscription orderIds.
 2012-12-04 18:48:03 -08:00
Dirk Dougherty
6a3ad96831 am 1cb5ad47: am 147b01bc: Merge "Doc change: In-app Billing -- add notes about orderId change and subscription orderIds." into jb-mr1-dev 
* commit '1cb5ad47a1137ffab0d935f186c5ea6645dd59e5':
  Doc change: In-app Billing -- add notes about orderId change and subscription orderIds.
 2012-12-04 18:45:39 -08:00
Dirk Dougherty
1cb5ad47a1 am 147b01bc: Merge "Doc change: In-app Billing -- add notes about orderId change and subscription orderIds." into jb-mr1-dev 
* commit '147b01bc637ad8d184bd0aa2d6bf902e69c92107':
  Doc change: In-app Billing -- add notes about orderId change and subscription orderIds.
 2012-12-04 18:43:25 -08:00
Dirk Dougherty
147b01bc63 Merge "Doc change: In-app Billing -- add notes about orderId change and subscription orderIds." into jb-mr1-dev 2012-12-04 18:40:32 -08:00
Dirk Dougherty
b973b3adfe Doc change: In-app Billing -- add notes about orderId change and subscription orderIds. 
Change-Id: Iccd08387a6d28ac04c303f9da10d1d98dbf8f8b1
 2012-12-04 18:38:09 -08:00
Scott Main
74dd15b202 am 0de625b5: am 174af198: am 3bb56f02: docs: add link to developer survey on main landing pages 
* commit '0de625b5c687519f1f389fd522556af775ac762e':
  docs: add link to developer survey on main landing pages
 2012-12-04 18:34:07 -08:00
Scott Main
0de625b5c6 am 174af198: am 3bb56f02: docs: add link to developer survey on main landing pages 
* commit '174af19814451ddb7e4ec76cfbea06ed86233ddf':
  docs: add link to developer survey on main landing pages
 2012-12-04 18:32:39 -08:00
Scott Main
174af19814 am 3bb56f02: docs: add link to developer survey on main landing pages 
* commit '3bb56f02f89d626757b01015be6861f4c6389154':
  docs: add link to developer survey on main landing pages
 2012-12-04 18:31:34 -08:00
Scott Main
3bb56f02f8 docs: add link to developer survey on main landing pages 
Change-Id: Icf635993a6b3ff20d6e226b1e13358fd0ffcd398
 2012-12-04 18:26:52 -08:00
Laurent Tu
87830ae771 am aa3ac463: am dd549bcc: Merge "DO NOT MERGE Protect against NPE in FusionEngine.java." into jb-mr1.1-dev 
* commit 'aa3ac463c99e50e574fb02c4ea5015beedb8debe':
  DO NOT MERGE Protect against NPE in FusionEngine.java.
 2012-12-04 17:49:18 -08:00
Laurent Tu
aa3ac463c9 am dd549bcc: Merge "DO NOT MERGE Protect against NPE in FusionEngine.java." into jb-mr1.1-dev 
* commit 'dd549bcc29402198698865cf4fd9650d0e909d23':
  DO NOT MERGE Protect against NPE in FusionEngine.java.
 2012-12-04 17:47:19 -08:00
Laurent Tu
dd549bcc29 Merge "DO NOT MERGE Protect against NPE in FusionEngine.java." into jb-mr1.1-dev 2012-12-04 17:45:31 -08:00
Scott Main
b0ebd4e941 am 2fb9b61a: am 315557b0: am 78d17441: docs: fix broken link on maps page 
* commit '2fb9b61a766a1faa0dca166c19f27cac58763f8d':
  docs: fix broken link on maps page
 2012-12-04 17:39:46 -08:00
Scott Main
2fb9b61a76 am 315557b0: am 78d17441: docs: fix broken link on maps page 
* commit '315557b0154bc5fcfe79131a8092985d8fada6e2':
  docs: fix broken link on maps page
 2012-12-04 17:37:28 -08:00
Scott Main
315557b015 am 78d17441: docs: fix broken link on maps page 
* commit '78d17441fadc38dc452871da722b1b2900de7a67':
  docs: fix broken link on maps page
 2012-12-04 17:36:00 -08:00
Scott Main
8b93e77c9d am 1e94db6e: am 3341bde3: am fc677afe: Merge "docs: update webview guide with javascript interface info" into jb-mr1-dev 
* commit '1e94db6ef9a43a6468bf7f4e64e3536cb87fbf5c':
  docs: update webview guide with javascript interface info
 2012-12-04 17:33:30 -08:00
Scott Main
78d17441fa docs: fix broken link on maps page 
Change-Id: I07e8129df1dcc61b0c2f7b81065092b06e31b8e8
 2012-12-04 17:32:30 -08:00
Scott Main
1e94db6ef9 am 3341bde3: am fc677afe: Merge "docs: update webview guide with javascript interface info" into jb-mr1-dev 
* commit '3341bde3d75ffe29a540af6b77051bb1afde08a2':
  docs: update webview guide with javascript interface info
 2012-12-04 17:31:22 -08:00
Scott Main
3341bde3d7 am fc677afe: Merge "docs: update webview guide with javascript interface info" into jb-mr1-dev 
* commit 'fc677afec5ecae1844c0f46e381b9b7967d820b4':
  docs: update webview guide with javascript interface info
 2012-12-04 17:29:18 -08:00
Scott Main
cbb234e4b8 am 13bad174: am 8a1074d5: am 7550a393: docs: fix AI download links 
* commit '13bad174f50abc6f782e5570809883e59bc15163':
  docs: fix AI download links
 2012-12-04 17:27:46 -08:00
Scott Main
fc677afec5 Merge "docs: update webview guide with javascript interface info" into jb-mr1-dev 2012-12-04 17:25:58 -08:00
Scott Main
13bad174f5 am 8a1074d5: am 7550a393: docs: fix AI download links 
* commit '8a1074d5500b16509687fa383e07f46cce996ce8':
  docs: fix AI download links
 2012-12-04 17:25:38 -08:00
Scott Main
8a1074d550 am 7550a393: docs: fix AI download links 
* commit '7550a393e0bb7b5f75fd558c828653097723d201':
  docs: fix AI download links
 2012-12-04 17:23:39 -08:00
Jeff Brown
1edc61119d am 61e21940: am 7fcb5dc5: Merge "Pin electron beam surface to natural orientation." into jb-mr1.1-dev 
* commit '61e21940ffd643dad1aa6c7c3dc9933815aecd74':
  Pin electron beam surface to natural orientation.
 2012-12-04 17:21:00 -08:00
Jeff Brown
61e21940ff am 7fcb5dc5: Merge "Pin electron beam surface to natural orientation." into jb-mr1.1-dev 
* commit '7fcb5dc5e9fbad0f183f425e88e576aaca98b0d7':
  Pin electron beam surface to natural orientation.
 2012-12-04 17:18:52 -08:00
Jeff Brown
7fcb5dc5e9 Merge "Pin electron beam surface to natural orientation." into jb-mr1.1-dev 2012-12-04 17:15:34 -08:00
satok
8ec9f8f074 am dc5b21a5: am 487f8e93: Merge "Fix an issue on installing 3rd-party IME by a non-primary user" into jb-mr1.1-dev 
* commit 'dc5b21a54850735bdfd1fbbd83375b2578ed4b02':
  Fix an issue on installing 3rd-party IME by a non-primary user
 2012-12-04 17:14:17 -08:00
satok
dc5b21a548 am 487f8e93: Merge "Fix an issue on installing 3rd-party IME by a non-primary user" into jb-mr1.1-dev 
* commit '487f8e93b0b5e2949fbfa6b60fd5e0a7a3e4d5b7':
  Fix an issue on installing 3rd-party IME by a non-primary user
 2012-12-04 17:12:10 -08:00
satok
487f8e93b0 Merge "Fix an issue on installing 3rd-party IME by a non-primary user" into jb-mr1.1-dev 2012-12-04 17:09:57 -08:00
Scott Main
c0512832f4 am 231719fa: am fff0fb87: am 82e1d979: update building first app class with some changes to eclipse workflow and account for small differences when using an IDE other than eclipse 
* commit '231719fa9c22df02408c17444503b790c9f0d1b9':
  update building first app class with some changes to eclipse workflow and account for small differences when using an IDE other than eclipse
 2012-12-04 16:47:32 -08:00
Scott Main
231719fa9c am fff0fb87: am 82e1d979: update building first app class with some changes to eclipse workflow and account for small differences when using an IDE other than eclipse 
* commit 'fff0fb87271faf8f19d9fd062c5ebfb720204223':
  update building first app class with some changes to eclipse workflow and account for small differences when using an IDE other than eclipse
 2012-12-04 16:45:25 -08:00
Scott Main
7550a393e0 docs: fix AI download links 
Change-Id: I2773f0edf1dc73bee9b8ea1ca0e09a9fd85086ef
 2012-12-04 16:44:27 -08:00
Scott Main
fff0fb8727 am 82e1d979: update building first app class with some changes to eclipse workflow and account for small differences when using an IDE other than eclipse 
* commit '82e1d979ff7d6571f124b00d4354d40aa8757664':
  update building first app class with some changes to eclipse workflow and account for small differences when using an IDE other than eclipse
 2012-12-04 16:42:23 -08:00
Scott Main
82e1d979ff update building first app class with some changes to eclipse workflow 
and account for small differences when using an IDE other than eclipse

Change-Id: I1ea8a00cd3d03623a43d6b5f75234095130c0aa3
 2012-12-04 16:38:18 -08:00
Victoria Lease
6861e258f0 am 1d20e05e: am 82a76800: Merge "DO NOT MERGE Notify provider when disposing last UpdateRecord" into jb-mr1.1-dev 
* commit '1d20e05e487faa02acca2dcb2ae9d527d097ce7d':
  DO NOT MERGE Notify provider when disposing last UpdateRecord
 2012-12-04 16:35:23 -08:00
Scott Main
5931fa81bd am a8a19ac5: am 3b08bb9d: am f9861221: docs: delete gps overview page 
* commit 'a8a19ac5ab6c0612fe0d5bcc10b84d585fcaf509':
  docs: delete gps overview page
 2012-12-04 16:35:20 -08:00
Raph Levien
8a3def6ef9 am 0da0d337: am a7acb4b9: Merge "Fix for bug 7467609 Bad rendering of Telugu text" into jb-mr1.1-dev 
* commit '0da0d337752ea153fb0e9f5d73512060ff007f6d':
  Fix for bug 7467609 Bad rendering of Telugu text
 2012-12-04 16:35:16 -08:00
Sascha Prueter
98c958097b am 8f7eddbe: am 652d8fc9: Merge "PRIORITY_MIN notifications should be truly ambient." into jb-mr1.1-dev 
* commit '8f7eddbef33f97e7d4439707ac0039be4c81ef0e':
  PRIORITY_MIN notifications should be truly ambient.
 2012-12-04 16:35:12 -08:00